From: Matthias Dieter Wallnöfer <mdw@samba.org>
Date: Fri, 4 May 2012 09:41:03 +0000 (+0200)
Subject: LDB:ldif_handlers.c - LDB_OP_GREATER/LDB_OP_LESS are thought as ">=" or "<="
X-Git-Tag: samba-4.0.0beta7~101
X-Git-Url: http://git.samba.org/samba.git/?p=vlendec%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=536c082505fea55eb12056791e170c8cf80b36cb

LDB:ldif_handlers.c - LDB_OP_GREATER/LDB_OP_LESS are thought as ">=" or "<="

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/ldb-samba/ldif_handlers.c b/lib/ldb-samba/ldif_handlers.c
index af66623efaf..1cf7df76ff6 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 47145a23011..cfa29591940 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++;