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

openldap: Use 'LDAPMessage *msg' for messages

Browse Source 
This frees up the 'result' variable for CURLcode based result codes.
This commit is contained in:
Steve Holme 2014-12-27 21:07:53 +00:00
parent 2728caa613
commit e9e48a6ff2
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/openldap.c
View File

@ -227,7 +227,7 @@ static CURLcode ldap_connecting(struct connectdata *conn, bool *done)
{ {
ldapconninfo *li = conn->proto.generic; ldapconninfo *li = conn->proto.generic;
struct SessionHandle *data=conn->data; struct SessionHandle *data=conn->data;
LDAPMessage *result = NULL; LDAPMessage *msg = NULL;
struct timeval tv = {0,1}, *tvp; struct timeval tv = {0,1}, *tvp;
int rc, err; int rc, err;
char *info = NULL; char *info = NULL;
@ -279,7 +279,7 @@ retry:
return CURLE_OK; return CURLE_OK;
} }
rc = ldap_result(li->ld, li->msgid, LDAP_MSG_ONE, tvp, &result); rc = ldap_result(li->ld, li->msgid, LDAP_MSG_ONE, tvp, &msg);
if(rc < 0) { if(rc < 0) {
failf(data, "LDAP local: bind ldap_result %s", ldap_err2string(rc)); failf(data, "LDAP local: bind ldap_result %s", ldap_err2string(rc));
return CURLE_LDAP_CANNOT_BIND; return CURLE_LDAP_CANNOT_BIND;
@ -288,7 +288,8 @@ retry:
/* timed out */ /* timed out */
return CURLE_OK; return CURLE_OK;
} }
rc = ldap_parse_result(li->ld, result, &err, NULL, &info, NULL, NULL, 1);
rc = ldap_parse_result(li->ld, msg, &err, NULL, &info, NULL, NULL, 1);
if(rc) { if(rc) {
failf(data, "LDAP local: bind ldap_parse_result %s", ldap_err2string(rc)); failf(data, "LDAP local: bind ldap_parse_result %s", ldap_err2string(rc));
return CURLE_LDAP_CANNOT_BIND; return CURLE_LDAP_CANNOT_BIND;
@ -409,18 +410,19 @@ static ssize_t ldap_recv(struct connectdata *conn, int sockindex, char *buf,
size_t len, CURLcode *err) size_t len, CURLcode *err)
{ {
ldapconninfo *li = conn->proto.generic; ldapconninfo *li = conn->proto.generic;
struct SessionHandle *data=conn->data; struct SessionHandle *data = conn->data;
ldapreqinfo *lr = data->req.protop; ldapreqinfo *lr = data->req.protop;
int rc, ret; int rc, ret;
LDAPMessage *result = NULL; LDAPMessage *msg = NULL;
LDAPMessage *ent; LDAPMessage *ent;
BerElement *ber = NULL; BerElement *ber = NULL;
struct timeval tv = {0,1}; struct timeval tv = {0,1};
(void)len; (void)len;
(void)buf; (void)buf;
(void)sockindex; (void)sockindex;
rc = ldap_result(li->ld, lr->msgid, LDAP_MSG_RECEIVED, &tv, &result); rc = ldap_result(li->ld, lr->msgid, LDAP_MSG_RECEIVED, &tv, &msg);
if(rc < 0) { if(rc < 0) {
failf(data, "LDAP local: search ldap_result %s", ldap_err2string(rc)); failf(data, "LDAP local: search ldap_result %s", ldap_err2string(rc));
*err = CURLE_RECV_ERROR; *err = CURLE_RECV_ERROR;
@ -431,10 +433,10 @@ static ssize_t ldap_recv(struct connectdata *conn, int sockindex, char *buf,
ret = -1; ret = -1;
/* timed out */ /* timed out */
if(result == NULL) if(!msg)
return ret; return ret;
for(ent = ldap_first_message(li->ld, result); ent; for(ent = ldap_first_message(li->ld, msg); ent;
ent = ldap_next_message(li->ld, ent)) { ent = ldap_next_message(li->ld, ent)) {
struct berval bv, *bvals, **bvp = &bvals; struct berval bv, *bvals, **bvp = &bvals;
int binary = 0, msgtype; int binary = 0, msgtype;
@ -546,7 +548,7 @@ static ssize_t ldap_recv(struct connectdata *conn, int sockindex, char *buf,
if(error) { if(error) {
ber_memfree(bvals); ber_memfree(bvals);
ber_free(ber, 0); ber_free(ber, 0);
ldap_msgfree(result); ldap_msgfree(msg);
*err = error; *err = error;
return -1; return -1;
} }
@ -594,7 +596,7 @@ static ssize_t ldap_recv(struct connectdata *conn, int sockindex, char *buf,
data->req.bytecount++; data->req.bytecount++;
ber_free(ber, 0); ber_free(ber, 0);
} }
ldap_msgfree(result); ldap_msgfree(msg);
return ret; return ret;
} }