diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-01-28 16:39:03 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-28 16:39:03 +1100 |
commit | c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67 (patch) | |
tree | 8efaf6b885543a006a91294923324fc580d01bbf /source4/dsdb/samdb/ldb_modules/ranged_results.c | |
parent | 11061499e182b9c41ec793d4eefb8a2cf7c88bfe (diff) | |
parent | cab677a33f0376cd1bf96ec561dc0463bbf80edd (diff) | |
download | samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.gz samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.bz2 samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.zip |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit f0a4db22e58d393be5b28f767ee6d0abfc8f11dc)
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/ranged_results.c')
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/ranged_results.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/ranged_results.c b/source4/dsdb/samdb/ldb_modules/ranged_results.c index 345b8b8440..c527afc6db 100644 --- a/source4/dsdb/samdb/ldb_modules/ranged_results.c +++ b/source4/dsdb/samdb/ldb_modules/ranged_results.c @@ -153,8 +153,10 @@ static int rr_search(struct ldb_module *module, struct ldb_request *req) if (strncasecmp(p, ";range=", strlen(";range=")) != 0) { continue; } - if (sscanf(p, ";range=%u-*", &start) == 1) { - } else if (sscanf(p, ";range=%u-%u", &start, &end) != 2) { + if (sscanf(p, ";range=%u-%u", &start, &end) == 2) { + } else if (sscanf(p, ";range=%u-*", &start) == 1) { + end = (unsigned int)-1; + } else { ldb_asprintf_errstring(module->ldb, "range request error: range requst malformed"); return LDB_ERR_UNWILLING_TO_PERFORM; } |