From 264c15c72fe050f5e8d2f1cb2444a459df6fe99f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 26 Nov 2019 13:09:35 +0100 Subject: dirmngr: Rework of the LDAP code, part 1. * dirmngr/http.h (struct parsed_uri_s): Add flag is_ldap. * dirmngr/http.c (do_parse_uri): Set flag. Do not error out for a missing slashes in an http scheme if NO_SCHEME_CHECK is active. * dirmngr/t-http.c (main): Print new flag. * dirmngr/ks-engine-ldap.c (ks_ldap_help): Use flag instead of checking the scheme. * dirmngr/ldap-parse-uri.c (ldap_uri_p): Re-implement using http_parse_uri. * dirmngr/t-ldap-parse-uri.c (main): Add option --verbose. -- This patch merely remove the separate parser for checking for an LDAP scheme. It is better to let our generic URI parser handle this. Also fixes this bug || url[4] == 'i' || url[4] == 'i') to make the rarely used ldapi scheme case-insensitive. More changes to the LDAP code are planned. Signed-off-by: Werner Koch --- dirmngr/t-http.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dirmngr/t-http.c') diff --git a/dirmngr/t-http.c b/dirmngr/t-http.c index 70d7f3fac..8ad5e7a0f 100644 --- a/dirmngr/t-http.c +++ b/dirmngr/t-http.c @@ -419,8 +419,9 @@ main (int argc, char **argv) } putchar ('\n'); } - printf ("Flags :%s%s%s%s\n", + printf ("Flags :%s%s%s%s%s\n", uri->is_http? " http":"", + uri->is_ldap? " ldap":"", uri->opaque? " opaque":"", uri->v6lit? " v6lit":"", uri->onion? " onion":""); -- cgit v1.2.3