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)

1 files changed, 9 insertions, 11 deletions

diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
index 136dae352a..d504a53a83 100644
--- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
+++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
@@ -49,14 +49,14 @@ static struct ldb_context *sptr_db_connect(TALLOC_CTX *mem_ctx)
 
 static int sptr_db_search(struct ldb_context *ldb,
 			  TALLOC_CTX *mem_ctx,
-			  const struct ldb_dn *basedn,
+			  struct ldb_dn *basedn,
 			  struct ldb_message ***res,
 			  const char * const *attrs,
 			  const char *format, ...) PRINTF_ATTRIBUTE(6,7);
 
 static int sptr_db_search(struct ldb_context *ldb,
 			  TALLOC_CTX *mem_ctx,
-			  const struct ldb_dn *basedn,
+			  struct ldb_dn *basedn,
 			  struct ldb_message ***res,
 			  const char * const *attrs,
 			  const char *format, ...)
@@ -227,7 +227,7 @@ static WERROR sptr_EnumPrintServerForms(struct ntptr_GenericHandle *server, TALL
 	union spoolss_FormInfo *info;
 
 	count = sptr_db_search(sptr_db, mem_ctx,
-				ldb_dn_explode(mem_ctx, "CN=Forms,CN=PrintServer"),
+				ldb_dn_new(mem_ctx, sptr_db, "CN=Forms,CN=PrintServer"),
 				&msgs, NULL, "(&(objectClass=form))");
 
 	if (count == 0) return WERR_OK;
@@ -282,7 +282,7 @@ static WERROR sptr_AddPrintServerForm(struct ntptr_GenericHandle *server, TALLOC
 			return WERR_FOOBAR;
 		}
 		count = sptr_db_search(sptr_db, mem_ctx,
-				       ldb_dn_explode(mem_ctx, "CN=Forms,CN=PrintServer"),
+				       ldb_dn_new(mem_ctx, sptr_db, "CN=Forms,CN=PrintServer"),
 				       &msgs, attrs, "(&(form-name=%s)(objectClass=form))",
 				       r->in.info.info1->form_name);
 
@@ -298,9 +298,7 @@ static WERROR sptr_AddPrintServerForm(struct ntptr_GenericHandle *server, TALLOC
 		W_ERROR_HAVE_NO_MEMORY(msg);
 
 		/* add core elements to the ldb_message for the Form */
-		msg->dn = ldb_dn_build_child(msg,
-					     "form-name", r->in.info.info1->form_name,
-					     ldb_dn_explode(msg, "CN=Forms,CN=PrintServer"));
+		msg->dn = ldb_dn_new_fmt(msg, sptr_db, "form-name=%s,CN=Forms,CN=PrintServer", r->in.info.info1->form_name);
 		SET_STRING(sptr_db, msg, "objectClass", "form");
 
 		SET_UINT(sptr_db, msg, "flags", r->in.info.info1->flags);
@@ -349,7 +347,7 @@ static WERROR sptr_SetPrintServerForm(struct ntptr_GenericHandle *server, TALLOC
 		}
 
 		count = sptr_db_search(sptr_db, mem_ctx,
-				       ldb_dn_explode(mem_ctx, "CN=Forms,CN=PrintServer"),
+				       ldb_dn_new(mem_ctx, sptr_db, "CN=Forms,CN=PrintServer"),
 				       &msgs, attrs, "(&(form-name=%s)(objectClass=form))",
 				       r->in.info.info1->form_name);
 
@@ -412,7 +410,7 @@ static WERROR sptr_DeletePrintServerForm(struct ntptr_GenericHandle *server, TAL
 	}
 
 	count = sptr_db_search(sptr_db, mem_ctx,
-			       ldb_dn_explode(mem_ctx, "CN=Forms,CN=PrintServer"),
+			       ldb_dn_new(mem_ctx, sptr_db, "CN=Forms,CN=PrintServer"),
 			       &msgs, attrs, "(&(form-name=%s)(objectclass=form))",
 			       r->in.form_name);
 
@@ -704,7 +702,7 @@ static WERROR sptr_GetPrinterForm(struct ntptr_GenericHandle *printer, TALLOC_CT
 {
 	struct ldb_context *sptr_db = talloc_get_type(printer->ntptr->private_data, struct ldb_context);
 	struct ldb_message **msgs;
-	const struct ldb_dn *base_dn;
+	struct ldb_dn *base_dn;
 	int count;
 	union spoolss_FormInfo *info;
 
@@ -714,7 +712,7 @@ static WERROR sptr_GetPrinterForm(struct ntptr_GenericHandle *printer, TALLOC_CT
 	 * }
 	 */
 
-	base_dn = ldb_dn_string_compose(mem_ctx, NULL, "CN=Forms, CN=%s, CN=Printers", printer->object_name);
+	base_dn = ldb_dn_new_fmt(mem_ctx, sptr_db, "CN=Forms,CN=%s,CN=Printers", printer->object_name);
 	W_ERROR_HAVE_NO_MEMORY(base_dn);
 
 	count = sptr_db_search(sptr_db, mem_ctx, base_dn, &msgs, NULL,