diff options
| author | Curl Upstream <curl-library@cool.haxx.se> | 2016-08-03 06:37:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-03 18:26:29 (GMT) |
| commit | 202adcfe056681109fe61569ecdb3bd69f0b4f97 (patch) | |
| tree | babb186f9f5f5e1345c61a2b2a4b955a9bae7849 /lib/ldap.c | |
| parent | 7ec709d3d7cc988d4cf6dc2c49713d4c55f09542 (diff) | |
| download | CMake-202adcfe056681109fe61569ecdb3bd69f0b4f97.zip CMake-202adcfe056681109fe61569ecdb3bd69f0b4f97.tar.gz CMake-202adcfe056681109fe61569ecdb3bd69f0b4f97.tar.bz2 | |
curl 2016-08-03 (f2cb3a01)
Code extracted from:
https://github.com/bagder/curl.git
at commit f2cb3a01192d36395d16acec6cdb93446ca6fd45 (curl-7_50_1).
Diffstat (limited to 'lib/ldap.c')
| -rw-r--r-- | lib/ldap.c | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -5,11 +5,11 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, 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 - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is @@ -76,9 +76,8 @@ #include "curl_base64.h" #include "rawstr.h" #include "connect.h" +/* The last 3 #include files should be in this order */ #include "curl_printf.h" - -/* The last #include files should be: */ #include "curl_memory.h" #include "memdebug.h" @@ -193,7 +192,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done) LDAPMessage *ldapmsg = NULL; LDAPMessage *entryIterator; int num = 0; - struct SessionHandle *data=conn->data; + struct Curl_easy *data=conn->data; int ldap_proto = LDAP_VERSION3; int ldap_ssl = 0; char *val_b64 = NULL; @@ -228,7 +227,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done) goto quit; } - /* Get the URL scheme ( either ldap or ldaps ) */ + /* Get the URL scheme (either ldap or ldaps) */ if(conn->given->flags & PROTOPT_SSL) ldap_ssl = 1; infof(data, "LDAP local: trying to establish %s connection\n", @@ -717,7 +716,7 @@ static int str2scope (const char *p) return LDAP_SCOPE_BASE; if(strequal(p, "sub")) return LDAP_SCOPE_SUBTREE; - if(strequal( p, "subtree")) + if(strequal(p, "subtree")) return LDAP_SCOPE_SUBTREE; return (-1); } |