r7527: - added a ldb_search_bytree() interface, which takes a ldb_parse_tree

  instead of a search expression. This allows our ldap server to pass
  its ASN.1 parsed search expressions straight to ldb, instead of going
  via strings.

- updated all the ldb modules code to handle the new interface

- got rid of the separate ldb_parse.h now that the ldb_parse
  structures are exposed externally

- moved to C99 structure initialisation in ldb

- switched ldap server to using ldb_search_bytree()
(This used to be commit 96620ab2ee5d440bbbc51c1bc0cad9977770f897)

3 files changed, 36 insertions, 18 deletions

diff --git a/source4/lib/ldb/modules/schema.c b/source4/lib/ldb/modules/schema.c
index 29e5194416..e11c8b4e4e 100644
--- a/source4/lib/ldb/modules/schema.c
+++ b/source4/lib/ldb/modules/schema.c
@@ -306,6 +306,13 @@ static int schema_search(struct ldb_module *module, const char *base,
 	return ldb_next_search(module, base, scope, expression, attrs, res); 
 }
 
+static int schema_search_bytree(struct ldb_module *module, const char *base,
+				enum ldb_scope scope, struct ldb_parse_tree *tree,
+				const char * const *attrs, struct ldb_message ***res)
+{
+	return ldb_next_search_bytree(module, base, scope, tree, attrs, res); 
+}
+
 /* add_record */
 static int schema_add_record(struct ldb_module *module, const struct ldb_message *msg)
 {
@@ -541,15 +548,16 @@ static int schema_destructor(void *module_ctx)
 }
 
 static const struct ldb_module_ops schema_ops = {
-	"schema",
-	schema_search,
-	schema_add_record,
-	schema_modify_record,
-	schema_delete_record,
-	schema_rename_record,
-	schema_named_lock,
-	schema_named_unlock,
-	schema_errstring,
+	.name          = "schema",
+	.search        = schema_search,
+	.search_bytree = schema_search_bytree,
+	.add_record    = schema_add_record,
+	.modify_record = schema_modify_record,
+	.delete_record = schema_delete_record,
+	.rename_record = schema_rename_record,
+	.named_lock    = schema_named_lock,
+	.named_unlock  = schema_named_unlock,
+	.errstring     = schema_errstring,
 };
 
 #ifdef HAVE_DLOPEN_DISABLED
diff --git a/source4/lib/ldb/modules/skel.c b/source4/lib/ldb/modules/skel.c
index 505b19a288..1221ac70f1 100644
--- a/source4/lib/ldb/modules/skel.c
+++ b/source4/lib/ldb/modules/skel.c
@@ -103,6 +103,7 @@ static int skel_destructor(void *module_ctx)
 static const struct ldb_module_ops skel_ops = {
 	.name		= "skel",
 	.search		= skel_search,
+	.search_bytree	= skel_search_bytree,
 	.add_record	= skel_add_record,
 	.modify_record	= skel_modify_record,
 	.delete_record	= skel_delete_record,
diff --git a/source4/lib/ldb/modules/timestamps.c b/source4/lib/ldb/modules/timestamps.c
index 1c01bd14fd..c1db85a284 100644
--- a/source4/lib/ldb/modules/timestamps.c
+++ b/source4/lib/ldb/modules/timestamps.c
@@ -49,6 +49,14 @@ static int timestamps_search(struct ldb_module *module, const char *base,
 	return ldb_next_search(module, base, scope, expression, attrs, res);
 }
 
+static int timestamps_search_bytree(struct ldb_module *module, const char *base,
+				    enum ldb_scope scope, struct ldb_parse_tree *tree,
+				    const char * const *attrs, struct ldb_message ***res)
+{
+	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_search\n");
+	return ldb_next_search_bytree(module, base, scope, tree, attrs, res);
+}
+
 static int add_time_element(struct ldb_module *module, struct ldb_message *msg, 
 			    const char *attr_name, const char *time_string, unsigned int flags)
 {
@@ -247,15 +255,16 @@ static int timestamps_destructor(void *module_ctx)
 }
 
 static const struct ldb_module_ops timestamps_ops = {
-	"timestamps",
-	timestamps_search,
-	timestamps_add_record,
-	timestamps_modify_record,
-	timestamps_delete_record,
-	timestamps_rename_record,
-	timestamps_lock,
-	timestamps_unlock,
-	timestamps_errstring
+	.name          = "timestamps",
+	.search        = timestamps_search,
+	.search_bytree = timestamps_search_bytree,
+	.add_record    = timestamps_add_record,
+	.modify_record = timestamps_modify_record,
+	.delete_record = timestamps_delete_record,
+	.rename_record = timestamps_rename_record,
+	.named_lock    = timestamps_lock,
+	.named_unlock  = timestamps_unlock,
+	.errstring     = timestamps_errstring
 };