summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2012-05-04 11:41:03 +0200
committerAndrew Bartlett <abartlet@samba.org>2012-08-22 01:31:55 +0200
commit536c082505fea55eb12056791e170c8cf80b36cb (patch)
treef664c17d740a3f421bad5aa52304e0b0210b91d4 /lib
parent5f8006cb64c6537f3004e91319d071a603e4468e (diff)
downloadsamba-536c082505fea55eb12056791e170c8cf80b36cb.tar.gz
samba-536c082505fea55eb12056791e170c8cf80b36cb.tar.bz2
samba-536c082505fea55eb12056791e170c8cf80b36cb.zip
LDB:ldif_handlers.c - LDB_OP_GREATER/LDB_OP_LESS are thought as ">=" or "<="
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/ldb-samba/ldif_handlers.c4
-rw-r--r--lib/ldb/common/ldb_parse.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ldb-samba/ldif_handlers.c b/lib/ldb-samba/ldif_handlers.c
index af66623efa..1cf7df76ff 100644
--- a/lib/ldb-samba/ldif_handlers.c
+++ b/lib/ldb-samba/ldif_handlers.c
@@ -1139,9 +1139,9 @@ static int samba_syntax_operator_fn(struct ldb_context *ldb, enum ldb_parse_op o
ret = a->syntax->comparison_fn(ldb, tmp_ctx, v1, v2);
talloc_free(tmp_ctx);
if (operation == LDB_OP_GREATER) {
- *matched = (ret > 0);
+ *matched = (ret >= 0);
} else if (operation == LDB_OP_LESS) {
- *matched = (ret < 0);
+ *matched = (ret <= 0);
} else {
*matched = (ret == 0);
}
diff --git a/lib/ldb/common/ldb_parse.c b/lib/ldb/common/ldb_parse.c
index 47145a2301..cfa2959194 100644
--- a/lib/ldb/common/ldb_parse.c
+++ b/lib/ldb/common/ldb_parse.c
@@ -343,7 +343,7 @@ static enum ldb_parse_op ldb_parse_filtertype(TALLOC_CTX *mem_ctx, char **type,
}
if (!filter) {
talloc_free(name);
- return filter;
+ return 0;
}
p++;