generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ldap: use the new protocol handler setup

Browse Source 
Use the new flags field and stop using the old protocol defines.
This commit is contained in:
Daniel Stenberg 2011-03-15 09:13:11 +01:00
parent 2bbaddb05a
commit 211504ba8a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ldap.c
View File

@ -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");