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

ldap: rename variables to comply to curl standards

Browse Source
This commit is contained in:
Daniel Stenberg 2014-12-10 00:36:31 +01:00
parent f768be0a25
commit 0e8158eabc
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/ldap.c
View File

@ -168,11 +168,11 @@ const struct Curl_handler Curl_handler_ldaps = {
static CURLcode Curl_ldap(struct connectdata *conn, bool *done) static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
{ {
CURLcode status = CURLE_OK; CURLcode result = CURLE_OK;
int rc = 0; int rc = 0;
LDAP *server = NULL; LDAP *server = NULL;
LDAPURLDesc *ludp = NULL; LDAPURLDesc *ludp = NULL;
LDAPMessage *result = NULL; LDAPMessage *ldapmsg = NULL;
LDAPMessage *entryIterator; LDAPMessage *entryIterator;
int num = 0; int num = 0;
struct SessionHandle *data=conn->data; struct SessionHandle *data=conn->data;
@ -197,7 +197,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
#endif #endif
if(rc != 0) { if(rc != 0) {
failf(data, "LDAP local: %s", ldap_err2string(rc)); failf(data, "LDAP local: %s", ldap_err2string(rc));
status = CURLE_LDAP_INVALID_URL; result = CURLE_LDAP_INVALID_URL;
goto quit; goto quit;
} }
@ -225,7 +225,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
rc = ldapssl_client_init(NULL, NULL); rc = ldapssl_client_init(NULL, NULL);
if(rc != LDAP_SUCCESS) { if(rc != LDAP_SUCCESS) {
failf(data, "LDAP local: ldapssl_client_init %s", ldap_err2string(rc)); failf(data, "LDAP local: ldapssl_client_init %s", ldap_err2string(rc));
status = CURLE_SSL_CERTPROBLEM; result = CURLE_SSL_CERTPROBLEM;
goto quit; goto quit;
} }
if(data->set.ssl.verifypeer) { if(data->set.ssl.verifypeer) {
@ -237,7 +237,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
if(!ldap_ca) { if(!ldap_ca) {
failf(data, "LDAP local: ERROR %s CA cert not set!", failf(data, "LDAP local: ERROR %s CA cert not set!",
(cert_type == LDAPSSL_CERT_FILETYPE_DER ? "DER" : "PEM")); (cert_type == LDAPSSL_CERT_FILETYPE_DER ? "DER" : "PEM"));
status = CURLE_SSL_CERTPROBLEM; result = CURLE_SSL_CERTPROBLEM;
goto quit; goto quit;
} }
infof(data, "LDAP local: using %s CA cert '%s'\n", infof(data, "LDAP local: using %s CA cert '%s'\n",
@ -248,7 +248,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
failf(data, "LDAP local: ERROR setting %s CA cert: %s", failf(data, "LDAP local: ERROR setting %s CA cert: %s",
(cert_type == LDAPSSL_CERT_FILETYPE_DER ? "DER" : "PEM"), (cert_type == LDAPSSL_CERT_FILETYPE_DER ? "DER" : "PEM"),
ldap_err2string(rc)); ldap_err2string(rc));
status = CURLE_SSL_CERTPROBLEM; result = CURLE_SSL_CERTPROBLEM;
goto quit; goto quit;
} }
ldap_option = LDAPSSL_VERIFY_SERVER; ldap_option = LDAPSSL_VERIFY_SERVER;
@ -259,14 +259,14 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
if(rc != LDAP_SUCCESS) { if(rc != LDAP_SUCCESS) {
failf(data, "LDAP local: ERROR setting cert verify mode: %s", failf(data, "LDAP local: ERROR setting cert verify mode: %s",
ldap_err2string(rc)); ldap_err2string(rc));
status = CURLE_SSL_CERTPROBLEM; result = CURLE_SSL_CERTPROBLEM;
goto quit; goto quit;
} }
server = ldapssl_init(conn->host.name, (int)conn->port, 1); server = ldapssl_init(conn->host.name, (int)conn->port, 1);
if(server == NULL) { if(server == NULL) {
failf(data, "LDAP local: Cannot connect to %s:%ld", failf(data, "LDAP local: Cannot connect to %s:%ld",
conn->host.name, conn->port); conn->host.name, conn->port);
status = CURLE_COULDNT_CONNECT; result = CURLE_COULDNT_CONNECT;
goto quit; goto quit;
} }
#elif defined(LDAP_OPT_X_TLS) #elif defined(LDAP_OPT_X_TLS)
@ -275,12 +275,12 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
if((data->set.str[STRING_CERT_TYPE]) && if((data->set.str[STRING_CERT_TYPE]) &&
(!Curl_raw_equal(data->set.str[STRING_CERT_TYPE], "PEM"))) { (!Curl_raw_equal(data->set.str[STRING_CERT_TYPE], "PEM"))) {
failf(data, "LDAP local: ERROR OpenLDAP only supports PEM cert-type!"); failf(data, "LDAP local: ERROR OpenLDAP only supports PEM cert-type!");
status = CURLE_SSL_CERTPROBLEM; result = CURLE_SSL_CERTPROBLEM;
goto quit; goto quit;
} }
if(!ldap_ca) { if(!ldap_ca) {
failf(data, "LDAP local: ERROR PEM CA cert not set!"); failf(data, "LDAP local: ERROR PEM CA cert not set!");
status = CURLE_SSL_CERTPROBLEM; result = CURLE_SSL_CERTPROBLEM;
goto quit; goto quit;
} }
infof(data, "LDAP local: using PEM CA cert: %s\n", ldap_ca); infof(data, "LDAP local: using PEM CA cert: %s\n", ldap_ca);
@ -288,7 +288,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
if(rc != LDAP_SUCCESS) { if(rc != LDAP_SUCCESS) {
failf(data, "LDAP local: ERROR setting PEM CA cert: %s", failf(data, "LDAP local: ERROR setting PEM CA cert: %s",
ldap_err2string(rc)); ldap_err2string(rc));
status = CURLE_SSL_CERTPROBLEM; result = CURLE_SSL_CERTPROBLEM;
goto quit; goto quit;
} }
ldap_option = LDAP_OPT_X_TLS_DEMAND; ldap_option = LDAP_OPT_X_TLS_DEMAND;
@ -300,14 +300,14 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
if(rc != LDAP_SUCCESS) { if(rc != LDAP_SUCCESS) {
failf(data, "LDAP local: ERROR setting cert verify mode: %s", failf(data, "LDAP local: ERROR setting cert verify mode: %s",
ldap_err2string(rc)); ldap_err2string(rc));
status = CURLE_SSL_CERTPROBLEM; result = CURLE_SSL_CERTPROBLEM;
goto quit; goto quit;
} }
server = ldap_init(conn->host.name, (int)conn->port); server = ldap_init(conn->host.name, (int)conn->port);
if(server == NULL) { if(server == NULL) {
failf(data, "LDAP local: Cannot connect to %s:%ld", failf(data, "LDAP local: Cannot connect to %s:%ld",
conn->host.name, conn->port); conn->host.name, conn->port);
status = CURLE_COULDNT_CONNECT; result = CURLE_COULDNT_CONNECT;
goto quit; goto quit;
} }
ldap_option = LDAP_OPT_X_TLS_HARD; ldap_option = LDAP_OPT_X_TLS_HARD;
@ -315,7 +315,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
if(rc != LDAP_SUCCESS) { if(rc != LDAP_SUCCESS) {
failf(data, "LDAP local: ERROR setting SSL/TLS mode: %s", failf(data, "LDAP local: ERROR setting SSL/TLS mode: %s",
ldap_err2string(rc)); ldap_err2string(rc));
status = CURLE_SSL_CERTPROBLEM; result = CURLE_SSL_CERTPROBLEM;
goto quit; goto quit;
} }
/* /*
@ -323,7 +323,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
if(rc != LDAP_SUCCESS) { if(rc != LDAP_SUCCESS) {
failf(data, "LDAP local: ERROR starting SSL/TLS mode: %s", failf(data, "LDAP local: ERROR starting SSL/TLS mode: %s",
ldap_err2string(rc)); ldap_err2string(rc));
status = CURLE_SSL_CERTPROBLEM; result = CURLE_SSL_CERTPROBLEM;
goto quit; goto quit;
} }
*/ */
@ -332,7 +332,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
should check in first place if we can support LDAP SSL/TLS */ should check in first place if we can support LDAP SSL/TLS */
failf(data, "LDAP local: SSL/TLS not supported with this version " failf(data, "LDAP local: SSL/TLS not supported with this version "
"of the OpenLDAP toolkit\n"); "of the OpenLDAP toolkit\n");
status = CURLE_SSL_CERTPROBLEM; result = CURLE_SSL_CERTPROBLEM;
goto quit; goto quit;
#endif #endif
#endif #endif
@ -343,7 +343,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
if(server == NULL) { if(server == NULL) {
failf(data, "LDAP local: Cannot connect to %s:%ld", failf(data, "LDAP local: Cannot connect to %s:%ld",
conn->host.name, conn->port); conn->host.name, conn->port);
status = CURLE_COULDNT_CONNECT; result = CURLE_COULDNT_CONNECT;
goto quit; goto quit;
} }
} }
@ -363,20 +363,20 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
} }
if(rc != 0) { if(rc != 0) {
failf(data, "LDAP local: ldap_simple_bind_s %s", ldap_err2string(rc)); failf(data, "LDAP local: ldap_simple_bind_s %s", ldap_err2string(rc));
status = CURLE_LDAP_CANNOT_BIND; result = CURLE_LDAP_CANNOT_BIND;
goto quit; goto quit;
} }
rc = ldap_search_s(server, ludp->lud_dn, ludp->lud_scope, rc = ldap_search_s(server, ludp->lud_dn, ludp->lud_scope,
ludp->lud_filter, ludp->lud_attrs, 0, &result); ludp->lud_filter, ludp->lud_attrs, 0, &ldapmsg);
if(rc != 0 && rc != LDAP_SIZELIMIT_EXCEEDED) { if(rc != 0 && rc != LDAP_SIZELIMIT_EXCEEDED) {
failf(data, "LDAP remote: %s", ldap_err2string(rc)); failf(data, "LDAP remote: %s", ldap_err2string(rc));
status = CURLE_LDAP_SEARCH_FAILED; result = CURLE_LDAP_SEARCH_FAILED;
goto quit; goto quit;
} }
for(num = 0, entryIterator = ldap_first_entry(server, result); for(num = 0, entryIterator = ldap_first_entry(server, ldapmsg);
entryIterator; entryIterator;
entryIterator = ldap_next_entry(server, entryIterator), num++) { entryIterator = ldap_next_entry(server, entryIterator), num++) {
BerElement *ber = NULL; BerElement *ber = NULL;
@ -418,7 +418,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
ldap_memfree(dn); ldap_memfree(dn);
if(ber) if(ber)
ber_free(ber, 0); ber_free(ber, 0);
status = error; result = error;
goto quit; goto quit;
} }
if(val_b64_sz > 0) { if(val_b64_sz > 0) {
@ -450,8 +450,8 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
} }
quit: quit:
if(result) { if(ldapmsg) {
ldap_msgfree(result); ldap_msgfree(ldapmsg);
LDAP_TRACE (("Received %d entries\n", num)); LDAP_TRACE (("Received %d entries\n", num));
} }
if(rc == LDAP_SIZELIMIT_EXCEEDED) if(rc == LDAP_SIZELIMIT_EXCEEDED)
@ -469,7 +469,7 @@ quit:
Curl_setup_transfer(conn, -1, -1, FALSE, NULL, -1, NULL); Curl_setup_transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
connclose(conn, "LDAP connection always disable re-use"); connclose(conn, "LDAP connection always disable re-use");
return status; return result;
} }
#ifdef DEBUG_LDAP #ifdef DEBUG_LDAP