diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-04-03 16:48:33 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-05-20 04:01:11 +0000 |
| commit | 11c20e03d7de7099e6f0b8ad0169a82b0e270c80 (patch) | |
| tree | 0a1adcf478839b83ce30b44794ff86d424f27eb2 /source4 | |
| parent | 98226287491d04945b36413425cc59b0fbd8355d (diff) | |
| download | samba-11c20e03d7de7099e6f0b8ad0169a82b0e270c80.tar.gz | |
ldap_server: Remove success_limit
This was always set to 0 so was poinless. Any LDAP scope can return 0 entries,
even a SCOPE_BASE if the filter does not match.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/ldap_server/ldap_backend.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c index 9f72734f973..2b8a86b623a 100644 --- a/source4/ldap_server/ldap_backend.c +++ b/source4/ldap_server/ldap_backend.c @@ -521,7 +521,6 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call) enum ldb_scope scope = LDB_SCOPE_DEFAULT; const char **attrs = NULL; const char *scope_str, *errstr = NULL; - int success_limit = 1; int result = -1; int ldb_ret = -1; unsigned int i, j; @@ -544,17 +543,14 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call) case LDAP_SEARCH_SCOPE_BASE: scope_str = "BASE"; scope = LDB_SCOPE_BASE; - success_limit = 0; break; case LDAP_SEARCH_SCOPE_SINGLE: scope_str = "ONE"; scope = LDB_SCOPE_ONELEVEL; - success_limit = 0; break; case LDAP_SEARCH_SCOPE_SUB: scope_str = "SUB"; scope = LDB_SCOPE_SUBTREE; - success_limit = 0; break; default: result = LDAP_PROTOCOL_ERROR; @@ -749,15 +745,11 @@ reply: if (result != -1) { } else if (ldb_ret == LDB_SUCCESS) { - if (res->count >= success_limit) { - DEBUG(10,("SearchRequest: results: [%d]\n", res->count)); - result = LDAP_SUCCESS; - errstr = NULL; - } if (res->controls) { done_r->msg->controls = res->controls; talloc_steal(done_r, res->controls); } + result = LDB_SUCCESS; } else { DEBUG(10,("SearchRequest: error\n")); result = map_ldb_error(local_ctx, ldb_ret, ldb_errstring(samdb), |