diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-05-03 14:51:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:51:43 -0500 |
| commit | 208e09747c242ab5bd59a658033db49efa8d8696 (patch) | |
| tree | 46fd31e75aa1e805f3abb9fa572f36da2b70b3da /source4/lib/ldb/common | |
| parent | b96695ca23f8d1d95ed2e038ea66e6a0580356c3 (diff) | |
| download | samba-208e09747c242ab5bd59a658033db49efa8d8696.tar.gz samba-208e09747c242ab5bd59a658033db49efa8d8696.tar.bz2 samba-208e09747c242ab5bd59a658033db49efa8d8696.zip | |
r456: - added -i option to ldbsearch
- fixed sorting bug in ldb index handing
(This used to be commit cdd48e2b9b3ca6be5503eec401e09db162408ac8)
Diffstat (limited to 'source4/lib/ldb/common')
| -rw-r--r-- | source4/lib/ldb/common/ldb.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/common/util.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index ac77f306e9..ce21d1d9e2 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -81,7 +81,7 @@ int ldb_search(struct ldb_context *ldb, const char *base, enum ldb_scope scope, const char *expression, - char * const attrs[], struct ldb_message ***res) + const char * const *attrs, struct ldb_message ***res) { return ldb->ops->search(ldb, base, scope, expression, attrs, res); } diff --git a/source4/lib/ldb/common/util.c b/source4/lib/ldb/common/util.c index 534d07c1df..22bbc8334e 100644 --- a/source4/lib/ldb/common/util.c +++ b/source4/lib/ldb/common/util.c @@ -85,10 +85,13 @@ int list_find(const void *needle, } return test_i; } - if (r == -1) { + if (r < 0) { + if (test_i == 0) { + return -1; + } max_i = test_i - 1; } - if (r == 1) { + if (r > 0) { min_i = test_i + 1; } } |