mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ITS#1675, make sure search results are initialized

Browse Source
This commit is contained in:
Howard Chu 2002-03-25 11:52:39 +00:00
parent 6033aeb6cf
commit f20a6a27b3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
servers/slapd/backglue.c
View File

@ -327,6 +327,7 @@ glue_back_search (
case LDAP_SCOPE_ONELEVEL: case LDAP_SCOPE_ONELEVEL:
case LDAP_SCOPE_SUBTREE: case LDAP_SCOPE_SUBTREE:
op->o_callback = &cb; op->o_callback = &cb;
rc = gs.err = LDAP_UNWILLING_TO_PERFORM;
/* /*
* Execute in reverse order, most general first * Execute in reverse order, most general first
@ -336,13 +337,17 @@ glue_back_search (
continue; continue;
if (tlimit) { if (tlimit) {
t2limit = stoptime - slap_get_time (); t2limit = stoptime - slap_get_time ();
if (t2limit <= 0) if (t2limit <= 0) {
rc = gs.err = LDAP_TIMELIMIT_EXCEEDED;
break; break;
}
} }
if (slimit) { if (slimit) {
s2limit = slimit - gs.nentries; s2limit = slimit - gs.nentries;
if (s2limit <= 0) if (s2limit <= 0) {
rc = gs.err = LDAP_SIZELIMIT_EXCEEDED;
break; break;
}
} }
/* /*
* check for abandon * check for abandon