aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-03-15 09:13:11 +0100
committerDaniel Stenberg <daniel@haxx.se>2011-03-15 09:13:11 +0100
commit211504ba8a31d0696f728eed167b083f0c0f474d (patch)
tree4f7e9b6c7ca54c9903f0a69737934130dfdf85cd
parent2bbaddb05a0da27ec3b84bcad9bdc512219a458e (diff)
ldap: use the new protocol handler setup
Use the new flags field and stop using the old protocol defines.
-rw-r--r--lib/ldap.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ldap.c b/lib/ldap.c
index 529e45212..7e26d985b 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -140,7 +140,8 @@ const struct Curl_handler Curl_handler_ldap = {
ZERO_NULL, /* perform_getsock */
ZERO_NULL, /* disconnect */
PORT_LDAP, /* defport */
- PROT_LDAP /* protocol */
+ CURLPROTO_LDAP, /* protocol */
+ PROTOPTS_NONE /* flags */
};
#ifdef HAVE_LDAP_SSL
@@ -162,7 +163,8 @@ const struct Curl_handler Curl_handler_ldaps = {
ZERO_NULL, /* perform_getsock */
ZERO_NULL, /* disconnect */
PORT_LDAPS, /* defport */
- PROT_LDAP | PROT_SSL /* protocol */
+ CURLPROTO_LDAP | CURLPROTO_LDAPS, /* protocol */
+ PROTOPT_SSL /* flags */
};
#endif
@@ -203,7 +205,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
}
/* Get the URL scheme ( either ldap or ldaps ) */
- if(conn->protocol & PROT_SSL)
+ if(conn->given->protocol & CURLPROTO_LDAPS)
ldap_ssl = 1;
infof(data, "LDAP local: trying to establish %s connection\n",
ldap_ssl ? "encrypted" : "cleartext");