upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-04 06:01:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

do not assert when receiving intermediate response (partial fix to ITS#5931)

Browse source
This commit is contained in:
Pierangelo Masarati 2009-02-09 14:55:56 +00:00
parent 7e790c71c0
commit 911b5fd42e
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/back-ldap/search.c
View file

@ -423,6 +423,12 @@ retry:
rs->sr_ctrls = NULL;
}
} else if ( rc == LDAP_RES_INTERMEDIATE ) {
Debug( LDAP_DEBUG_ANY,
"%s ldap_back_search: "
"intermediate response not supported yet.\n",
op->o_log_prefix, 0, 0 );
} else {
char *err = NULL;

17
servers/slapd/back-meta/search.c
View file

@ -1411,6 +1411,16 @@ really_bad:;
*/
assert( ncandidates > 0 );
--ncandidates;
} else if ( rc == LDAP_RES_INTERMEDIATE ) {
/* TODO: ITS#5931 */
/* ignore right now */
Debug( LDAP_DEBUG_ANY,
"%s meta_back_search[%ld]: "
"intermediate response message not supported yet.\n",
op->o_log_prefix,
i, 0 );
} else if ( rc == LDAP_RES_BIND ) {
meta_search_candidate_t retcode;
@ -1450,7 +1460,12 @@ really_bad:;
}
} else {
assert( 0 );
Debug( LDAP_DEBUG_ANY,
"%s meta_back_search[%ld]: "
"unrecognized response message tag=%d\n",
op->o_log_prefix,
i, rc );
ldap_msgfree( res );
res = NULL;
goto really_bad;