r9391: Convert all the code to use struct ldb_dn to ohandle ldap like distinguished names

Provide more functions to handle DNs in this form
(This used to be commit 692e35b7797e39533dd2a1c4b63d9da30f1eb5ba)

9 files changed, 95 insertions, 50 deletions

diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 48dc8ddd47..7657301f35 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -57,6 +57,8 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const
 		{ "all", 'a',    POPT_ARG_NONE, &options.all_records, 0, "dn=*", NULL },
 		{ "sorted", 'S', POPT_ARG_NONE, &options.sorted, 0, "sort attributes", NULL },
 		{ "sasl-mechanism", 0, POPT_ARG_STRING, &options.sasl_mechanism, 0, "choose SASL mechanism", "MECHANISM" },
+		{ "input", 'I', POPT_ARG_STRING, &options.input, 0, "Input File", "Input" },
+		{ "output", 'O', POPT_ARG_STRING, &options.output, 0, "Output File", "Output" },
 		{ NULL,    'o', POPT_ARG_STRING, NULL, 'o', "ldb_connect option", "OPTION" },
 #ifdef _SAMBA_BUILD_
 		POPT_COMMON_SAMBA
@@ -149,16 +151,18 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const
 	*ret = options;
 
 	/* all utils need some option */
-	if (ret->url == NULL) {
-		fprintf(stderr, "You must supply a url with -H or with $LDB_URL\n");
-		if (usage) usage();
-		goto failed;
-	}
+	if (ldb) {
+		if (ret->url == NULL) {
+			fprintf(stderr, "You must supply a url with -H or with $LDB_URL\n");
+			if (usage) usage();
+			goto failed;
+		}
 
-	if (ldb_connect(ldb, ret->url, 0, ret->options) != 0) {
-		fprintf(stderr, "Failed to connect to %s - %s\n", 
-			ret->url, ldb_errstring(ldb));
-		goto failed;
+		if (ldb_connect(ldb, ret->url, 0, ret->options) != 0) {
+			fprintf(stderr, "Failed to connect to %s - %s\n", 
+				ret->url, ldb_errstring(ldb));
+			goto failed;
+		}
 	}
 
 	return ret;
diff --git a/source4/lib/ldb/tools/cmdline.h b/source4/lib/ldb/tools/cmdline.h
index 8e479c5538..daf9c06f42 100644
--- a/source4/lib/ldb/tools/cmdline.h
+++ b/source4/lib/ldb/tools/cmdline.h
@@ -40,6 +40,8 @@ struct ldb_cmdline {
 	int num_records;
 	int num_searches;
 	const char *sasl_mechanism;
+	const char *input;
+	const char *output;
 };
 
 struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const char **argv,
diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index 5be3b7fc75..de6da0eb5b 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -76,7 +76,7 @@ static int process_file(struct ldb_context *ldb, FILE *f)
 		ret = ldb_add(ldb, ldif->msg);
 		if (ret != 0) {
 			fprintf(stderr, "ERR: \"%s\" on DN %s\n", 
-				ldb_errstring(ldb), ldif->msg->dn);
+				ldb_errstring(ldb), ldb_dn_linearize(ldb, ldif->msg->dn));
 			failures++;
 		} else {
 			count++;
diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c
index fdb1f7ef3b..6082931e22 100644
--- a/source4/lib/ldb/tools/ldbdel.c
+++ b/source4/lib/ldb/tools/ldbdel.c
@@ -41,7 +41,7 @@
 #include "system/filesys.h"
 #endif
 
-static int ldb_delete_recursive(struct ldb_context *ldb, const char *dn)
+static int ldb_delete_recursive(struct ldb_context *ldb, const struct ldb_dn *dn)
 {
 	int ret, i, total=0;
 	const char *attrs[] = { "dn", NULL };
@@ -94,7 +94,13 @@ static void usage(void)
 	}
 
 	for (i=0;i<options->argc;i++) {
-		const char *dn = options->argv[i];
+		const struct ldb_dn *dn;
+
+		dn = ldb_dn_explode(ldb, options->argv[i]);
+		if (dn == NULL) {
+			printf("Invalid DN format\n");
+			exit(1);
+		}
 		if (options->recursive) {
 			ret = ldb_delete_recursive(ldb, dn);
 		} else {
@@ -104,7 +110,9 @@ static void usage(void)
 			}
 		}
 		if (ret != 0) {
-			printf("delete of '%s' failed - %s\n", dn, ldb_errstring(ldb));
+			printf("delete of '%s' failed - %s\n",
+				ldb_dn_linearize(ldb, dn),
+				ldb_errstring(ldb));
 		}
 	}
 
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index 1613f4ddc5..a850562a7d 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -83,7 +83,7 @@ static int modify_record(struct ldb_context *ldb,
 
 	if (ldb_modify(ldb, mod) != 0) {
 		fprintf(stderr, "failed to modify %s - %s\n", 
-			msg1->dn, ldb_errstring(ldb));
+			ldb_dn_linearize(ldb, msg1->dn), ldb_errstring(ldb));
 		return -1;
 	}
 
@@ -96,11 +96,11 @@ static int modify_record(struct ldb_context *ldb,
 static struct ldb_message *msg_find(struct ldb_context *ldb,
 				    struct ldb_message **msgs,
 				    int count,
-				    const char *dn)
+				    const struct ldb_dn *dn)
 {
 	int i;
 	for (i=0;i<count;i++) {
-		if (ldb_dn_cmp(ldb, dn, msgs[i]->dn) == 0) {
+		if (ldb_dn_compare(ldb, dn, msgs[i]->dn) == 0) {
 			return msgs[i];
 		}
 	}
@@ -128,7 +128,8 @@ static int merge_edits(struct ldb_context *ldb,
 			}
 			if (ldb_add(ldb, msgs2[i]) != 0) {
 				fprintf(stderr, "failed to add %s - %s\n",
-					msgs2[i]->dn, ldb_errstring(ldb));
+					ldb_dn_linearize(ldb, msgs2[i]->dn),
+					ldb_errstring(ldb));
 				return -1;
 			}
 			adds++;
@@ -148,7 +149,8 @@ static int merge_edits(struct ldb_context *ldb,
 			}
 			if (ldb_delete(ldb, msgs1[i]->dn) != 0) {
 				fprintf(stderr, "failed to delete %s - %s\n",
-					msgs1[i]->dn, ldb_errstring(ldb));
+					ldb_dn_linearize(ldb, msgs1[i]->dn),
+					ldb_errstring(ldb));
 				return -1;
 			}
 			deletes++;
@@ -279,6 +281,7 @@ static void usage(void)
 {
 	struct ldb_context *ldb;
 	struct ldb_message **msgs;
+	struct ldb_dn *basedn = NULL;
 	int ret;
 	const char *expression = "(|(objectclass=*)(dn=*))";
 	const char * const * attrs = NULL;
@@ -299,7 +302,15 @@ static void usage(void)
 		attrs = (const char * const *)(options->argv);
 	}
 
-	ret = ldb_search(ldb, options->basedn, options->scope, expression, attrs, &msgs);
+	if (options->basedn != NULL) {
+		basedn = ldb_dn_explode(ldb, options->basedn);
+		if (basedn == NULL) {
+			printf("Invalid Base DN format\n");
+			exit(1);
+		}
+	}
+
+	ret = ldb_search(ldb, basedn, options->scope, expression, attrs, &msgs);
 	if (ret == -1) {
 		printf("search failed - %s\n", ldb_errstring(ldb));
 		exit(1);
diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c
index 901a4c9628..4c78e485b5 100644
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -78,7 +78,7 @@ static int process_file(struct ldb_context *ldb, FILE *f)
 		}
 		if (ret != 0) {
 			fprintf(stderr, "ERR: \"%s\" on DN %s\n", 
-				ldb_errstring(ldb), ldif->msg->dn);
+				ldb_errstring(ldb), ldb_dn_linearize(ldb, ldif->msg->dn));
 			failures++;
 		} else {
 			count++;
diff --git a/source4/lib/ldb/tools/ldbrename.c b/source4/lib/ldb/tools/ldbrename.c
index c74516869e..4b3b27c130 100644
--- a/source4/lib/ldb/tools/ldbrename.c
+++ b/source4/lib/ldb/tools/ldbrename.c
@@ -61,7 +61,7 @@ static void usage(void)
 	struct ldb_context *ldb;
 	int ret;
 	struct ldb_cmdline *options;
-	const char *dn1, *dn2;
+	const struct ldb_dn *dn1, *dn2;
 
 	ldb = ldb_init(NULL);
 
@@ -71,15 +71,15 @@ static void usage(void)
 		usage();
 	}
 
-	dn1 = options->argv[0];
-	dn2 = options->argv[1];
+	dn1 = ldb_dn_explode(ldb, options->argv[0]);
+	dn2 = ldb_dn_explode(ldb, options->argv[1]);
 
 	ret = ldb_rename(ldb, dn1, dn2);
 	if (ret == 0) {
 		printf("Renamed 1 record\n");
 	} else  {
 		printf("rename of '%s' to '%s' failed - %s\n", 
-			dn1, dn2, ldb_errstring(ldb));
+			options->argv[0], options->argv[1], ldb_errstring(ldb));
 	}
 
 	talloc_free(ldb);
diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index 5604436980..4499bc9359 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -60,11 +60,11 @@ struct ldb_context *ldbsearch_ldb;
 static int do_compare_msg(struct ldb_message **el1,
 			  struct ldb_message **el2)
 {
-	return ldb_dn_cmp(ldbsearch_ldb, (*el1)->dn, (*el2)->dn);
+	return ldb_dn_compare(ldbsearch_ldb, (*el1)->dn, (*el2)->dn);
 }
 
 static int do_search(struct ldb_context *ldb,
-		     const char *basedn,
+		     const struct ldb_dn *basedn,
 		     int scope,
                      int sort_attribs,
 		     const char *expression,
@@ -120,6 +120,7 @@ static int do_search(struct ldb_context *ldb,
  int main(int argc, const char **argv)
 {
 	struct ldb_context *ldb;
+	struct ldb_dn *basedn = NULL;
 	const char * const * attrs = NULL;
 	struct ldb_cmdline *options;
 	int ret = -1;
@@ -142,16 +143,24 @@ static int do_search(struct ldb_context *ldb,
 		attrs = (const char * const *)(options->argv);
 	}
 
+	if (options->basedn != NULL) {
+		basedn = ldb_dn_explode(ldb, options->basedn);
+		if (basedn == NULL) {
+			fprintf(stderr, "Invalid Base DN format\n");
+			exit(1);
+		}
+	}
+
 	if (options->interactive) {
 		char line[1024];
 		while (fgets(line, sizeof(line), stdin)) {
-			if (do_search(ldb, options->basedn, 
+			if (do_search(ldb, basedn, 
 				      options->scope, options->sorted, line, attrs) == -1) {
 				ret = -1;
 			}
 		}
 	} else {
-		ret = do_search(ldb, options->basedn, options->scope, options->sorted, 
+		ret = do_search(ldb, basedn, options->scope, options->sorted, 
 				expression, attrs);
 	}
 
diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index aff1eaadda..a2e824dcdb 100644
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -58,7 +58,7 @@ static double _end_timer(void)
 }
 
 static void add_records(struct ldb_context *ldb,
-			const char *basedn,
+			const struct ldb_dn *basedn,
 			int count)
 {
 	struct ldb_message msg;
@@ -77,7 +77,7 @@ static void add_records(struct ldb_context *ldb,
 
 		asprintf(&name, "Test%d", i);
 
-		msg.dn = talloc_asprintf(tmp_ctx, "cn=%s,%s", name, basedn);
+		msg.dn = ldb_dn_build_child(tmp_ctx, "cn", name, basedn);
 		msg.num_elements = 6;
 		msg.elements = el;
 
@@ -145,7 +145,7 @@ static void add_records(struct ldb_context *ldb,
 }
 
 static void modify_records(struct ldb_context *ldb,
-			   const char *basedn,
+			   const struct ldb_dn *basedn,
 			   int count)
 {
 	struct ldb_message msg;
@@ -158,7 +158,7 @@ static void modify_records(struct ldb_context *ldb,
 		TALLOC_CTX *tmp_ctx = talloc_new(ldb);
 		
 		name = talloc_asprintf(tmp_ctx, "Test%d", i);
-		msg.dn = talloc_asprintf(tmp_ctx, "cn=%s,%s", name, basedn);
+		msg.dn = ldb_dn_build_child(tmp_ctx, "cn", name, basedn);
 
 		msg.num_elements = 3;
 		msg.elements = el;
@@ -197,29 +197,30 @@ static void modify_records(struct ldb_context *ldb,
 
 
 static void delete_records(struct ldb_context *ldb,
-			   const char *basedn,
+			   const struct ldb_dn *basedn,
 			   int count)
 {
 	int i;
 
 	for (i=0;i<count;i++) {
-		char *dn;
-		asprintf(&dn, "cn=Test%d,%s", i, basedn);
+		struct ldb_dn *dn;
+		char *name = talloc_asprintf(ldb, "Test%d", i);
+		dn = ldb_dn_build_child(name, "cn", name, basedn);
 
 		printf("Deleting uid Test%d\r", i);
 		fflush(stdout);
 
 		if (ldb_delete(ldb, dn) != 0) {
-			printf("Delete of %s failed - %s\n", dn, ldb_errstring(ldb));
+			printf("Delete of %s failed - %s\n", ldb_dn_linearize(ldb, dn), ldb_errstring(ldb));
 			exit(1);
 		}
-		free(dn);
+		talloc_free(name);
 	}
 
 	printf("\n");
 }
 
-static void search_uid(struct ldb_context *ldb, int nrecords, int nsearches)
+static void search_uid(struct ldb_context *ldb, struct ldb_dn *basedn, int nrecords, int nsearches)
 {
 	int i;
 
@@ -230,7 +231,7 @@ static void search_uid(struct ldb_context *ldb, int nrecords, int nsearches)
 		int ret;
 
 		asprintf(&expr, "(uid=TEST%d)", uid);
-		ret = ldb_search(ldb, options->basedn, LDB_SCOPE_SUBTREE, expr, NULL, &res);
+		ret = ldb_search(ldb, basedn, LDB_SCOPE_SUBTREE, expr, NULL, &res);
 
 		if (uid < nrecords && ret != 1) {
 			printf("Failed to find %s - %s\n", expr, ldb_errstring(ldb));
@@ -257,19 +258,23 @@ static void search_uid(struct ldb_context *ldb, int nrecords, int nsearches)
 
 static void start_test(struct ldb_context *ldb, int nrecords, int nsearches)
 {
+	struct ldb_dn *basedn;
+
+	basedn = ldb_dn_explode(ldb, options->basedn);
+
 	printf("Adding %d records\n", nrecords);
-	add_records(ldb, options->basedn, nrecords);
+	add_records(ldb, basedn, nrecords);
 
 	printf("Starting search on uid\n");
 	_start_timer();
-	search_uid(ldb, nrecords, nsearches);
+	search_uid(ldb, basedn, nrecords, nsearches);
 	printf("uid search took %.2f seconds\n", _end_timer());
 
 	printf("Modifying records\n");
-	modify_records(ldb, options->basedn, nrecords);
+	modify_records(ldb, basedn, nrecords);
 
 	printf("Deleting records\n");
-	delete_records(ldb, options->basedn, nrecords);
+	delete_records(ldb, basedn, nrecords);
 }
 
 
@@ -290,31 +295,37 @@ static void start_test_index(struct ldb_context **ldb)
 {
 	struct ldb_message *msg;
 	struct ldb_message **res;
+	struct ldb_dn *indexlist;
+	struct ldb_dn *basedn;
 	int ret;
 
 	printf("Starting index test\n");
 
-	ldb_delete(*ldb, "@INDEXLIST");
+	indexlist = ldb_dn_explode(NULL, "@INDEXLIST");
+
+	ldb_delete(*ldb, indexlist);
 
 	msg = ldb_msg_new(NULL);
 
-	msg->dn = strdup("@INDEXLIST");
+	msg->dn = indexlist;
 	ldb_msg_add_string(*ldb, msg, "@IDXATTR", strdup("uid"));
 
 	if (ldb_add(*ldb, msg) != 0) {
-		printf("Add of %s failed - %s\n", msg->dn, ldb_errstring(*ldb));
+		printf("Add of %s failed - %s\n", ldb_dn_linearize(*ldb, msg->dn), ldb_errstring(*ldb));
 		exit(1);
 	}
 
+	basedn = ldb_dn_explode(NULL, options->basedn);
+
 	memset(msg, 0, sizeof(*msg));
-	asprintf(&msg->dn, "cn=%s,%s", "test", options->basedn);
+	msg->dn = ldb_dn_build_child(msg, "cn", "test", basedn);
 	ldb_msg_add_string(*ldb, msg, "cn", strdup("test"));
 	ldb_msg_add_string(*ldb, msg, "sn", strdup("test"));
 	ldb_msg_add_string(*ldb, msg, "uid", strdup("test"));
 	ldb_msg_add_string(*ldb, msg, "objectClass", strdup("OpenLDAPperson"));
 
 	if (ldb_add(*ldb, msg) != 0) {
-		printf("Add of %s failed - %s\n", msg->dn, ldb_errstring(*ldb));
+		printf("Add of %s failed - %s\n", ldb_dn_linearize(*ldb, msg->dn), ldb_errstring(*ldb));
 		exit(1);
 	}
 
@@ -331,14 +342,14 @@ static void start_test_index(struct ldb_context **ldb)
 		exit(1);
 	}
 
-	ret = ldb_search(*ldb, options->basedn, LDB_SCOPE_SUBTREE, "uid=test", NULL, &res);
+	ret = ldb_search(*ldb, basedn, LDB_SCOPE_SUBTREE, "uid=test", NULL, &res);
 	if (ret != 1) {
 		printf("Should have found 1 record - found %d\n", ret);
 		exit(1);
 	}
 
 	if (ldb_delete(*ldb, msg->dn) != 0 ||
-	    ldb_delete(*ldb, "@INDEXLIST") != 0) {
+	    ldb_delete(*ldb, indexlist) != 0) {
 		printf("cleanup failed - %s\n", ldb_errstring(*ldb));
 		exit(1);
 	}