From cb2c43f7b032c26adf82f3ba7d6e3dc855f89fa4 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 16 Jul 2005 18:16:32 +0000
Subject: r8515: ldb_dn_cmp now uses ldb_dn_compare so that the DNs are
 compared on a content level not ona form level, his means that the 2 DNs: a)
 cn= user, dc=this, dc = is,dc=test b) cn=user,dc=this,dc=is,dc=test are now
 identical even if the string form differ (spaces) (This used to be commit
 76d496c30867ae80434483a34b0d842523aed762)

---
 source4/lib/ldb/common/ldb_dn.c   | 23 +++++++++++++++++++++++
 source4/lib/ldb/common/ldb_utf8.c |  9 ---------
 source4/lib/ldb/include/ldb.h     |  2 +-
 source4/lib/ldb/tools/ldbedit.c   | 10 ++++++----
 source4/lib/ldb/tools/ldbsearch.c |  7 +++++--
 5 files changed, 35 insertions(+), 16 deletions(-)

(limited to 'source4')

diff --git a/source4/lib/ldb/common/ldb_dn.c b/source4/lib/ldb/common/ldb_dn.c
index 32b575dd36..3cdc7ba85f 100644
--- a/source4/lib/ldb/common/ldb_dn.c
+++ b/source4/lib/ldb/common/ldb_dn.c
@@ -450,6 +450,29 @@ int ldb_dn_compare(struct ldb_context *ldb,
 	return ldb_dn_compare_base(ldb, edn0, edn1);
 }
 
+int ldb_dn_cmp(struct ldb_context *ldb, const char *dn0, const char *dn1)
+{
+	struct ldb_dn *edn0;
+	struct ldb_dn *edn1;
+	int ret;
+
+	edn0 = ldb_dn_explode_casefold(ldb, dn0);
+	if (edn0 == NULL) return 0;
+
+	edn1 = ldb_dn_explode_casefold(ldb, dn1);
+	if (edn1 == NULL) {
+		talloc_free(edn0);
+		return 0;
+	}
+
+	ret = ldb_dn_compare(ldb, edn0, edn1);
+
+	talloc_free(edn0);
+	talloc_free(edn1);
+
+	return ret;
+}
+
 /*
   casefold a dn. We need to casefold the attribute names, and canonicalize 
   attribute values of case insensitive attributes.
diff --git a/source4/lib/ldb/common/ldb_utf8.c b/source4/lib/ldb/common/ldb_utf8.c
index 5df5a6bba7..cd68180f77 100644
--- a/source4/lib/ldb/common/ldb_utf8.c
+++ b/source4/lib/ldb/common/ldb_utf8.c
@@ -72,15 +72,6 @@ int ldb_caseless_cmp(const char *s1, const char *s2)
 	return s2[i];
 }
 
-/*
-  compare two basedn fields
-  return 0 for match
-*/
-int ldb_dn_cmp(const char *dn1, const char *dn2)
-{
-	return ldb_caseless_cmp(dn1, dn2);
-}
-
 /*
   compare two attributes
   return 0 for match
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index c2d7b0d614..485e2bc730 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -335,7 +335,7 @@ int ldb_attrib_add_handlers(struct ldb_context *ldb,
 
 /* useful functions for ldb_message structure manipulation */
 
-int ldb_dn_cmp(const char *dn1, const char *dn2);
+int ldb_dn_cmp(struct ldb_context *ldb, const char *dn1, const char *dn2);
 int ldb_attr_cmp(const char *dn1, const char *dn2);
 
 /* case-fold a DN */
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index 12bf12bfff..1613f4ddc5 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -93,12 +93,14 @@ static int modify_record(struct ldb_context *ldb,
 /*
   find dn in msgs[]
 */
-static struct ldb_message *msg_find(struct ldb_message **msgs, int count,
+static struct ldb_message *msg_find(struct ldb_context *ldb,
+				    struct ldb_message **msgs,
+				    int count,
 				    const char *dn)
 {
 	int i;
 	for (i=0;i<count;i++) {
-		if (ldb_dn_cmp(dn, msgs[i]->dn) == 0) {
+		if (ldb_dn_cmp(ldb, dn, msgs[i]->dn) == 0) {
 			return msgs[i];
 		}
 	}
@@ -119,7 +121,7 @@ static int merge_edits(struct ldb_context *ldb,
 
 	/* do the adds and modifies */
 	for (i=0;i<count2;i++) {
-		msg = msg_find(msgs1, count1, msgs2[i]->dn);
+		msg = msg_find(ldb, msgs1, count1, msgs2[i]->dn);
 		if (!msg) {
 			if (options->verbose > 0) {
 				ldif_write_msg(ldb, stdout, LDB_CHANGETYPE_ADD, msgs2[i]);
@@ -139,7 +141,7 @@ static int merge_edits(struct ldb_context *ldb,
 
 	/* do the deletes */
 	for (i=0;i<count1;i++) {
-		msg = msg_find(msgs2, count2, msgs1[i]->dn);
+		msg = msg_find(ldb, msgs2, count2, msgs1[i]->dn);
 		if (!msg) {
 			if (options->verbose > 0) {
 				ldif_write_msg(ldb, stdout, LDB_CHANGETYPE_DELETE, msgs1[i]);
diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index 396bb7797a..5604436980 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -55,10 +55,12 @@ static void usage(void)
 	exit(1);
 }
 
+struct ldb_context *ldbsearch_ldb;
+
 static int do_compare_msg(struct ldb_message **el1,
-		struct ldb_message **el2)
+			  struct ldb_message **el2)
 {
-	return ldb_dn_cmp((*el1)->dn, (*el2)->dn);
+	return ldb_dn_cmp(ldbsearch_ldb, (*el1)->dn, (*el2)->dn);
 }
 
 static int do_search(struct ldb_context *ldb,
@@ -79,6 +81,7 @@ static int do_search(struct ldb_context *ldb,
 
 	printf("# returned %d records\n", ret);
 
+	ldbsearch_ldb = ldb;
 	if (sort_attribs) {
 		qsort(msgs, ret, sizeof(struct ldb_message *),
 				(comparison_fn_t)do_compare_msg);
-- 
cgit