summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2009-07-23 16:00:45 -0700
committerRich Megginson <rmeggins@redhat.com>2009-08-12 12:46:18 -0600
commitaffc8085fe361c9cd0da7b7130751dbc0db198ba (patch)
tree9f05ee3631eb5b4c3b54e9427359264046632862
parent025cc8c5099c4e2fd96eeec26523223228e207c4 (diff)
downloadds-affc8085fe361c9cd0da7b7130751dbc0db198ba.tar.gz
ds-affc8085fe361c9cd0da7b7130751dbc0db198ba.tar.xz
ds-affc8085fe361c9cd0da7b7130751dbc0db198ba.zip
Revert "513019 nsslapd-lookthroughlimit is not respected"
This reverts commit 1e3138f1d41562d6f42a8fdf0934af23219bb8e1. Misunderstood nsslapd-lookthroughlimit. Regardless of the filter test result, once hit the lookthroughlimit, search should be aborted there. That's what the original code does and that is correct.
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_search.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c
index ead99388..dacdb098 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_search.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c
@@ -1410,9 +1410,6 @@ ldbm_back_next_search_entry_ext( Slapi_PBlock *pb, int use_extension )
rc = SLAPI_FAIL_GENERAL;
goto bail;
}
- /* Since the filter test failed, the result won't be sent.
- * sr_lookthroughcount should be decremented. */
- --sr->sr_lookthroughcount;
}
}
}