r19831: Big ldb_dn optimization and interfaces enhancement patch

This patch changes a lot of the code in ldb_dn.c, and also
removes and add a number of manipulation functions around.

The aim is to avoid validating a dn if not necessary as the
validation code is necessarily slow. This is mainly to speed up
internal operations where input is not user generated and so we
can assume the DNs need no validation. The code is designed to
keep the data as a string if possible.

The code is not yet 100% perfect, but pass all the tests so far.
A memleak is certainly present, I'll work on that next.

Simo.
(This used to be commit a580c871d3784602a9cce32d33419e63c8236e63)

5 files changed, 19 insertions, 22 deletions

diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index 05f9787191..fb2037f75e 100644
--- a/source4/torture/ldap/cldap.c
+++ b/source4/torture/ldap/cldap.c
@@ -167,12 +167,12 @@ done:
   use the convenient ldif dump routines in ldb to print out cldap
   search results
 */
-static struct ldb_message *ldap_msg_to_ldb(TALLOC_CTX *mem_ctx, struct ldap_SearchResEntry *res)
+static struct ldb_message *ldap_msg_to_ldb(TALLOC_CTX *mem_ctx, struct ldb_context *ldb, struct ldap_SearchResEntry *res)
 {
 	struct ldb_message *msg;
 
 	msg = ldb_msg_new(mem_ctx);
-	msg->dn = ldb_dn_explode_or_special(msg, res->dn);
+	msg->dn = ldb_dn_new(msg, ldb, res->dn);
 	msg->num_elements = res->num_attributes;
 	msg->elements = talloc_steal(msg, res->attributes);
 	return msg;
@@ -194,7 +194,7 @@ static void cldap_dump_results(struct cldap_search *search)
 	ldb = ldb_init(NULL);
 
 	ZERO_STRUCT(ldif);
-	ldif.msg = ldap_msg_to_ldb(ldb, search->out.response);
+	ldif.msg = ldap_msg_to_ldb(ldb, ldb, search->out.response);
 
 	ldb_ldif_write_file(ldb, stdout, &ldif);
 
diff --git a/source4/torture/ldap/schema.c b/source4/torture/ldap/schema.c
index bc8f1e38ce..2ab0c5e116 100644
--- a/source4/torture/ldap/schema.c
+++ b/source4/torture/ldap/schema.c
@@ -119,7 +119,7 @@ static BOOL test_search_rootDSE(struct ldb_context *ldb, struct test_rootDSE *ro
 
 	d_printf("Testing RootDSE Search\n");
 
-	ret = ldb_search(ldb, ldb_dn_new(ldb), LDB_SCOPE_BASE, 
+	ret = ldb_search(ldb, ldb_dn_new(ldb, ldb, NULL), LDB_SCOPE_BASE, 
 			 NULL, NULL, &r);
 	if (ret != LDB_SUCCESS) {
 		return False;
@@ -226,7 +226,7 @@ static BOOL test_create_schema_type(struct ldb_context *ldb, struct test_rootDSE
 	ctrl[1] = NULL;
 
 	req->operation = LDB_SEARCH;
-	req->op.search.base = ldb_dn_explode(req, root->schemadn);
+	req->op.search.base = ldb_dn_new(req, ldb, root->schemadn);
 	req->op.search.scope = LDB_SCOPE_SUBTREE;
 	req->op.search.tree = ldb_parse_tree(req, filter);
 	if (req->op.search.tree == NULL) return -1;
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 555f02588c..2d521394ce 100644
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -133,8 +133,7 @@ static BOOL ldb_add_record(struct ldb_context *ldb, unsigned rid)
 		return False;
 	}
 
-	msg->dn = ldb_dn_string_compose(msg, NULL, "SID=S-1-5-21-53173311-3623041448-2049097239-%u", 
-					rid);
+	msg->dn = ldb_dn_new_fmt(msg, ldb, "SID=S-1-5-21-53173311-3623041448-2049097239-%u", rid);
 	if (msg->dn == NULL) {
 		return False;
 	}
@@ -206,25 +205,20 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data)
 		char *expr;
 
 		i = random() % torture_entries;
-		dn = ldb_dn_string_compose(tmp_ctx, NULL, "SID=S-1-5-21-53173311-3623041448-2049097239-%u", 
-					i);
-		if (ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res) != LDB_SUCCESS ||
-		    res->count != 1) {
-			torture_fail(torture, talloc_asprintf(torture,
-												  "Failed to find SID %d\n", i));
+		dn = ldb_dn_new_fmt(tmp_ctx, ldb, "SID=S-1-5-21-53173311-3623041448-2049097239-%u", i);
+		if (ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res) != LDB_SUCCESS || res->count != 1) {
+			torture_fail(torture, talloc_asprintf(torture, "Failed to find SID %d\n", i));
 		}
 		talloc_free(res);
 		talloc_free(dn);
 		expr = talloc_asprintf(tmp_ctx, "(UID=%u)", i);
-		if (ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res) != LDB_SUCCESS ||
-		    res->count != 1) {
-			torture_fail(torture, talloc_asprintf(torture, 
-												  "Failed to find UID %d\n", i));
+		if (ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res) != LDB_SUCCESS || res->count != 1) {
+			torture_fail(torture, talloc_asprintf(torture, "Failed to find UID %d\n", i));
 		}
 		talloc_free(res);
 		talloc_free(expr);
 	}
-	
+
 	if (talloc_total_blocks(torture) > 100) {
 		torture_fail(torture, "memory leak in ldb search\n");
 		goto failed;
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index e6ff33d58d..adf14461c0 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -211,6 +211,7 @@ BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	const char *dns_domain;
 	const char *nt4_domain;
 	const char *FQDN_1779_name;
+	struct ldb_context *ldb;
 	struct ldb_dn *FQDN_1779_dn;
 	struct ldb_dn *realm_dn;
 	const char *realm_dn_str;
@@ -318,9 +319,11 @@ BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	if (!ret) {
 		return ret;
 	}
+
+	ldb = ldb_init(mem_ctx);
 	
 	realm_dn_str = r.out.ctr.ctr1->array[0].result_name;
-	realm_dn =  ldb_dn_explode(mem_ctx, realm_dn_str);
+	realm_dn =  ldb_dn_new(mem_ctx, ldb, realm_dn_str);
 	realm_canonical = ldb_dn_canonical_string(mem_ctx, realm_dn);
 
 	if (strcmp(realm_canonical, 
@@ -399,7 +402,7 @@ BOOL test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	FQDN_1779_name = r.out.ctr.ctr1->array[0].result_name;
 
-	FQDN_1779_dn = ldb_dn_explode(mem_ctx, FQDN_1779_name);
+	FQDN_1779_dn = ldb_dn_new(mem_ctx, ldb, FQDN_1779_name);
 
 	canonical_name = ldb_dn_canonical_string(mem_ctx, FQDN_1779_dn);
 	canonical_ex_name = ldb_dn_canonical_ex_string(mem_ctx, FQDN_1779_dn);
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index d325f10cee..c9507287e8 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -424,8 +424,8 @@ NTSTATUS torture_leave_ads_domain(TALLOC_CTX *mem_ctx, struct libnet_JoinDomain
 	}
 
 	/* Remove CN=Servers,... entry from the AD. */ 
-	server_dn = ldb_dn_explode(tmp_ctx, libnet_r->out.server_dn_str);
-	if (!server_dn) {
+	server_dn = ldb_dn_new(tmp_ctx, ldb_ctx, libnet_r->out.server_dn_str);
+	if (! ldb_dn_validate(server_dn)) {
 		libnet_r->out.error_string = NULL;
 		talloc_free(tmp_ctx);
 		return NT_STATUS_NO_MEMORY;