mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't risk leaving around client library error codes

Browse Source
This commit is contained in:
Pierangelo Masarati 2010-06-22 23:10:48 +00:00
parent 127c533853
commit 1242443553
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
servers/slapd/back-ldap/bind.c
View File

@ -584,12 +584,13 @@ retry:;
rc = ldap_parse_extended_result( ld, res,
NULL, &data, 0 );
if ( rc == LDAP_SUCCESS ) {
int err;
rc = ldap_parse_result( ld, res, &err,
SlapReply rs;
rc = ldap_parse_result( ld, res, &rs.sr_err,
NULL, NULL, NULL, NULL, 1 );
if ( rc == LDAP_SUCCESS ) {
rc = err;
if ( rc != LDAP_SUCCESS ) {
rs.sr_err = rc;
}
rc = slap_map_api2result( &rs );
res = NULL;
/* FIXME: in case a referral
@ -1804,10 +1805,12 @@ retry:;
rc = ldap_parse_result( lc->lc_ld, res, &rs->sr_err,
&match, &text, &refs, &ctrls, 1 );
if ( rc == LDAP_SUCCESS ) {
rs->sr_text = text;
if ( rc != LDAP_SUCCESS ) {
} else {
rs->sr_err = rc;
}
rs->sr_err = slap_map_api2result( rs );
/* RFC 4511: referrals can only appear
* if result code is LDAP_REFERRAL */

9
servers/slapd/back-ldap/search.c
View File

@ -488,14 +488,15 @@ retry:
rc = ldap_parse_result( lc->lc_ld, res, &rs->sr_err,
&match.bv_val, &err,
&references, &rs->sr_ctrls, 1 );
if ( rc != LDAP_SUCCESS ) {
rs->sr_err = rc;
}
rs->sr_err = slap_map_api2result( rs );
if ( rc == LDAP_SUCCESS ) {
if ( err ) {
rs->sr_text = err;
freetext = 1;
}
} else {
rs->sr_err = rc;
}
rs->sr_err = slap_map_api2result( rs );
/* RFC 4511: referrals can only appear
* if result code is LDAP_REFERRAL */