upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-29 02:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7761 bail out of search if config is pausing

Browse source
This commit is contained in:
Howard Chu 2013-12-10 18:08:36 -08:00
parent 815eddda4c
commit 26ce222b6a
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servers/slapd/back-bdb/search.c
View file

@ -1038,6 +1038,9 @@ id_retry:
break;
default: /* entry not sent */
break;
case LDAP_BUSY:
send_ldap_result( op, rs );
goto done;
case LDAP_UNAVAILABLE:
case LDAP_SIZELIMIT_EXCEEDED:
if ( rs->sr_err == LDAP_SIZELIMIT_EXCEEDED ) {

3
servers/slapd/back-mdb/search.c
View file

@ -977,6 +977,9 @@ notfound:
break;
default: /* entry not sent */
break;
case LDAP_BUSY:
send_ldap_result( op, rs );
goto done;
case LDAP_UNAVAILABLE:
case LDAP_SIZELIMIT_EXCEEDED:
if ( rs->sr_err == LDAP_SIZELIMIT_EXCEEDED ) {

2
servers/slapd/back-perl/search.c
View file

@ -89,7 +89,7 @@ perl_back_search(
rs->sr_flags = 0;
rs->sr_attrs = NULL;
rs->sr_entry = NULL;
if ( rs->sr_err == LDAP_SIZELIMIT_EXCEEDED ) {
if ( rs->sr_err == LDAP_SIZELIMIT_EXCEEDED || rs->sr_err == LDAP_BUSY ) {
goto done;
}
}

1
servers/slapd/back-sql/search.c
View file

@ -2460,6 +2460,7 @@ backsql_search( Operation *op, SlapReply *rs )
goto end_of_search;
case LDAP_SIZELIMIT_EXCEEDED:
case LDAP_BUSY:
goto send_results;
}
}