mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

handle LDAPv2 when returning timelimit; silence warning

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-11-11 09:54:07 +00:00
parent e56ab6a720
commit 78bd3bf6a3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,7 +316,12 @@ retry:;
rc = ldap_parse_extended_result( ld, res, rc = ldap_parse_extended_result( ld, res,
NULL, &data, 0 ); NULL, &data, 0 );
if ( rc == LDAP_SUCCESS ) { if ( rc == LDAP_SUCCESS ) {
rc = ldap_result2error( ld, res, 1 ); int err;
rc = ldap_parse_result( ld, res, &err,
NULL, NULL, NULL, NULL, 1 );
if ( rc == LDAP_SUCCESS ) {
rc = err;
}
res = NULL; res = NULL;
/* FIXME: in case a referral /* FIXME: in case a referral
@ -834,7 +839,8 @@ retry:;
case 0: case 0:
if ( timeout ) { if ( timeout ) {
(void)ldap_abandon_ext( lc->lc_ld, msgid, NULL, NULL ); (void)ldap_abandon_ext( lc->lc_ld, msgid, NULL, NULL );
rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED; rs->sr_err = op->o_protocol >= LDAP_VERSION3 ?
LDAP_ADMINLIMIT_EXCEEDED : LDAP_OPERATIONS_ERROR;
rs->sr_text = "Operation timed out"; rs->sr_text = "Operation timed out";
break; break;
} }