Commit 99ce8f2a authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#7761 bail out of search if config is pausing

parent f75d8ed7
...@@ -1038,6 +1038,9 @@ id_retry: ...@@ -1038,6 +1038,9 @@ id_retry:
break; break;
default: /* entry not sent */ default: /* entry not sent */
break; break;
case LDAP_BUSY:
send_ldap_result( op, rs );
goto done;
case LDAP_UNAVAILABLE: case LDAP_UNAVAILABLE:
case LDAP_SIZELIMIT_EXCEEDED: case LDAP_SIZELIMIT_EXCEEDED:
if ( rs->sr_err == LDAP_SIZELIMIT_EXCEEDED ) { if ( rs->sr_err == LDAP_SIZELIMIT_EXCEEDED ) {
......
...@@ -977,6 +977,9 @@ notfound: ...@@ -977,6 +977,9 @@ notfound:
break; break;
default: /* entry not sent */ default: /* entry not sent */
break; break;
case LDAP_BUSY:
send_ldap_result( op, rs );
goto done;
case LDAP_UNAVAILABLE: case LDAP_UNAVAILABLE:
case LDAP_SIZELIMIT_EXCEEDED: case LDAP_SIZELIMIT_EXCEEDED:
if ( rs->sr_err == LDAP_SIZELIMIT_EXCEEDED ) { if ( rs->sr_err == LDAP_SIZELIMIT_EXCEEDED ) {
......
...@@ -89,7 +89,7 @@ perl_back_search( ...@@ -89,7 +89,7 @@ perl_back_search(
rs->sr_flags = 0; rs->sr_flags = 0;
rs->sr_attrs = NULL; rs->sr_attrs = NULL;
rs->sr_entry = 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; goto done;
} }
} }
......
...@@ -2460,6 +2460,7 @@ backsql_search( Operation *op, SlapReply *rs ) ...@@ -2460,6 +2460,7 @@ backsql_search( Operation *op, SlapReply *rs )
goto end_of_search; goto end_of_search;
case LDAP_SIZELIMIT_EXCEEDED: case LDAP_SIZELIMIT_EXCEEDED:
case LDAP_BUSY:
goto send_results; goto send_results;
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment