aboutsummaryrefslogtreecommitdiff
path: root/lib/url.c
diff options
context:
space:
mode:
authorHoward Chu <hyc@highlandsun.com>2010-05-25 00:44:42 +0200
committerDaniel Stenberg <daniel@haxx.se>2010-05-25 00:44:42 +0200
commit2e056353b00d0944bdb2f8e948cc40a4dc0f3dfb (patch)
tree65c8ce54b7aa6887a518b1faa9027c66cd3daade /lib/url.c
parent606b933a4fc59128c913aa943252f4a1a821aa5b (diff)
LDAP: properly implemented as a curl_handler
makes the LDAP code much cleaner, nicer and in general being a better libcurl citizen. If a new enough OpenLDAP version is detect, the new and shiny lib/openldap.c code is then used instead of the old cruft Code by Howard, minor cleanups by Daniel.
Diffstat (limited to 'lib/url.c')
-rw-r--r--lib/url.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/url.c b/lib/url.c
index 4fe2173dc..c59535a9c 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -181,13 +181,12 @@ static const struct Curl_handler * const protocols[] = {
&Curl_handler_dict,
#endif
-#ifndef CURL_DISABLE_LDAP
+#if !defined(CURL_DISABLE_LDAP) || defined(USE_OPENLDAP)
&Curl_handler_ldap,
-#endif
-
-#if !defined(CURL_DISABLE_LDAP) && defined(HAVE_LDAP_SSL)
+#if defined(HAVE_LDAP_SSL) || defined(USE_OPENLDAP)
&Curl_handler_ldaps,
#endif
+#endif
#ifndef CURL_DISABLE_FILE
&Curl_handler_file,