From 79ebe463e2aed9125c9086f6bff99adeef5e4b88 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 15 Nov 2004 11:42:17 +0000
Subject: r3755: add missing files (This used to be commit
 0b715b6ce21d23970d207d57e90133be17790d15)

---
 source4/lib/ldb/common/ldb_modules.c | 265 +++++++++++++++++++++++++++++++++++
 1 file changed, 265 insertions(+)
 create mode 100644 source4/lib/ldb/common/ldb_modules.c

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
new file mode 100644
index 0000000000..a7cfd81d46
--- /dev/null
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -0,0 +1,265 @@
+
+/* 
+   ldb database library
+
+   Copyright (C) Simo Sorce  2004
+
+     ** NOTE! The following LGPL license applies to the ldb
+     ** library. This does NOT imply that all of Samba is released
+     ** under the LGPL
+   
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ *  Name: ldb
+ *
+ *  Component: ldb modules core
+ *
+ *  Description: core modules routines
+ *
+ *  Author: Simo Sorce
+ */
+
+#include "includes.h"
+#include "dlinklist.h"
+#include <sys/types.h> 
+#include <sys/stat.h> 
+#include <unistd.h> 
+
+#define LDB_MODULE_PREFIX	"modules"
+#define LDB_MODULE_PREFIX_LEN	7
+#define LDB_MODULE_SEP		':'
+
+int ldb_load_modules(struct ldb_context *ldb, const char *options[])
+{
+	struct ldb_module *current;
+	char **modules;
+	char *p, *q;
+	int pn, i;
+
+	/* find out which modules we are requested to activate */
+	modules = NULL;
+	pn = 0;
+
+	if (options) {
+
+		for (i = 0; options[i] != NULL; i++) {
+
+			if (strncmp(options[i], LDB_MODULE_PREFIX, LDB_MODULE_PREFIX_LEN) == 0) {
+
+				p = q = ldb_strdup(ldb, &options[i][LDB_MODULE_PREFIX_LEN]);
+				if (*q != ':') {
+					ldb_free(ldb, q);
+					return -1;
+				}
+				do {
+					*p = '\0';
+					q = p + 1;
+					pn++;
+					modules = ldb_realloc_array(ldb, modules, sizeof(char *), pn);
+					if (!modules) {
+						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in register_modules()\n");
+						return -1;
+					}
+					modules[pn - 1] = q;
+				} while ((p = strchr(q, LDB_MODULE_SEP)));
+			}
+		}
+	}
+
+	if (!modules) { /* no modules in the options, look for @MODULES in the db */
+		int ret, j, k;
+		char * attrs[] = { "@MODULE" };
+		struct ldb_message **msg;
+
+		ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", (const char * const *)attrs, &msg);
+		if (ret == 0) {
+			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
+		} else {
+			if (ret < 0) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "ldb error (%s) occurred searching for modules, bailing out\n", ldb_errstring(ldb));
+				return -1;
+			}
+			if (ret > 1) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found, bailing out\n");
+				return -1;
+			}
+
+			for (j = 0; j < msg[0]->num_elements; j++) {
+				for (k = 0; k < msg[0]->elements[j].num_values; k++) {
+					pn++;
+					modules = ldb_realloc_array(ldb, modules, sizeof(char *), pn);
+					if (!modules) {
+						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in register_modules()\n");
+						return -1;
+					}
+					modules[pn - 1] = ldb_strndup(ldb, msg[0]->elements[j].values[k].data, msg[0]->elements[j].values[k].length);
+					if (!modules[pn - 1]) {
+						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in register_modules()\n");
+						return -1;
+					}
+				}
+			}
+		}
+		ldb_search_free(ldb, msg);
+	}
+
+	if (modules) {
+
+		for (i = 0; i < pn; i++) {
+
+			if (strcmp(modules[i], "timestamps") == 0) {
+				current = timestamps_module_init(ldb, options);
+				if (!current) {
+					ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+					return -1;
+				}
+				DLIST_ADD(ldb->modules, current);
+				continue;
+			}
+#if 0
+			if (strcmp(modules[i], "schema") == 0) {
+				current = schema_module_init(ldb, options);
+				if (!current) {
+					ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+					return -1;
+				}
+				DLIST_ADD(ldb->modules, current);
+				continue;
+			}
+#endif
+#ifdef HAVE_DLOPEN_DISABLED
+		{
+			void *handle;
+			init_ldb_module_function init;
+			struct stat st;
+			const char *errstr;
+
+			if (stat(modules[i], &st) < 0) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
+				return -1;
+			}
+
+			handle = dlopen(modules[i], RTLD_LAZY);
+
+			if (!handle) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "Error loading module %s [%s]\n", modules[i], dlerror());
+				return -1;
+			}
+
+			init = (init_ldb_module_function)dlsym(handle, "init_module");
+
+			errstr = dlerror();
+			if (errstr) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "Error trying to resolve symbol 'init_module' in %s [%s]\n", modules[i], errstr);
+				return -1;
+			}
+
+			current = init(ldb, options);
+			if (!current) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+				return -1;
+			}
+			DLIST_ADD(ldb->modules, current);
+		}
+#else
+		ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
+		return -1;
+#endif
+		}
+	}
+
+	return 0; 
+}
+
+/*
+   helper functions to call the next module in chain
+*/
+int ldb_next_close(struct ldb_module *module)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->close(module->next);
+}
+
+int ldb_next_search(struct ldb_module *module, 
+	       const char *base,
+	       enum ldb_scope scope,
+	       const char *expression,
+	       const char * const *attrs, struct ldb_message ***res)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->search(module->next, base, scope, expression, attrs, res);
+}
+
+int ldb_next_search_free(struct ldb_module *module, struct ldb_message **msg)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->search_free(module->next, msg);
+}
+
+int ldb_next_add_record(struct ldb_module *module, const struct ldb_message *message)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->add_record(module->next, message);
+}
+
+int ldb_next_modify_record(struct ldb_module *module, const struct ldb_message *message)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->modify_record(module->next, message);
+}
+
+int ldb_next_delete_record(struct ldb_module *module, const char *dn)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->delete_record(module->next, dn);
+}
+
+int ldb_next_rename_record(struct ldb_module *module, const char *olddn, const char *newdn)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->rename_record(module->next, olddn, newdn);
+}
+
+const char *ldb_next_errstring(struct ldb_module *module)
+{
+	if (!module->next) {
+		return NULL;
+	}
+	return module->next->ops->errstring(module->next);
+}
+
+void ldb_next_cache_free(struct ldb_module *module)
+{
+	if (!module->next) {
+		return;
+	}
+	module->next->ops->cache_free(module->next);
+}
-- 
cgit 


From 950f3eb508a70f2304f76a8307582690d4715670 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 15 Nov 2004 12:30:28 +0000
Subject: r3757: Some fixes for ldb_ldap Now we pass also the test-ldap tests
 :-) (This used to be commit 0d58b1dc5aa0b00a924c1c5506f0c500c0b37b3e)

---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index a7cfd81d46..37be07c1ca 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -80,7 +80,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		}
 	}
 
-	if (!modules) { /* no modules in the options, look for @MODULES in the db */
+	if (!modules && strcmp("ldap", ldb->modules->ops->name)) { /* no modules in the options, look for @MODULES in the db (not for ldap) */
 		int ret, j, k;
 		char * attrs[] = { "@MODULE" };
 		struct ldb_message **msg;
-- 
cgit 


From 8a18778286a16423d7d6e483fdb308a91e294efe Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 16 Nov 2004 09:00:52 +0000
Subject: r3783: - don't use make proto for ldb anymore

- split ldh.h out of samba's includes.h

- make ldb_context and ldb_module private to the subsystem

- use ltdb_ prefix for all ldb_tdb functions

metze
(This used to be commit f5ee40d6ce8224e280070975efc9911558fe675c)
---
 source4/lib/ldb/common/ldb_modules.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 37be07c1ca..1a6a334b8d 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -34,6 +34,8 @@
  */
 
 #include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 #include "dlinklist.h"
 #include <sys/types.h> 
 #include <sys/stat.h> 
@@ -82,10 +84,10 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 
 	if (!modules && strcmp("ldap", ldb->modules->ops->name)) { /* no modules in the options, look for @MODULES in the db (not for ldap) */
 		int ret, j, k;
-		char * attrs[] = { "@MODULE" };
+		const char * const attrs[] = { "@MODULE" , NULL};
 		struct ldb_message **msg;
 
-		ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", (const char * const *)attrs, &msg);
+		ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", attrs, &msg);
 		if (ret == 0) {
 			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
 		} else {
@@ -144,7 +146,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 #ifdef HAVE_DLOPEN_DISABLED
 		{
 			void *handle;
-			init_ldb_module_function init;
+			ldb_module_init_function init;
 			struct stat st;
 			const char *errstr;
 
@@ -160,7 +162,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				return -1;
 			}
 
-			init = (init_ldb_module_function)dlsym(handle, "init_module");
+			init = (ldb_module_init_function)dlsym(handle, "init_module");
 
 			errstr = dlerror();
 			if (errstr) {
-- 
cgit 


From a4de8cd6a5a882a8d49fdb4b0e625ffdc6b401bb Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 21 Nov 2004 15:51:54 +0000
Subject: r3897: add a locking infrastructure (This used to be commit
 a99c0adb09e2bc77b876d23cb2d0711ccffd83ca)

---
 source4/lib/ldb/common/ldb_modules.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 1a6a334b8d..71ec3fdc00 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -250,6 +250,22 @@ int ldb_next_rename_record(struct ldb_module *module, const char *olddn, const c
 	return module->next->ops->rename_record(module->next, olddn, newdn);
 }
 
+int ldb_next_named_lock(struct ldb_module *module, const char *lockname)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->named_lock(module->next, lockname);
+}
+
+int ldb_next_named_unlock(struct ldb_module *module, const char *lockname)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->named_unlock(module->next, lockname);
+}
+
 const char *ldb_next_errstring(struct ldb_module *module)
 {
 	if (!module->next) {
-- 
cgit 


From 1a988ec9af7960616fb4661b20d86ff05146d836 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 2 Jan 2005 07:49:29 +0000
Subject: r4474: - converted ldb to use talloc internally

- added gcov flags to Makefile.ldb

- expanded ldb test suite to get more coverage
(This used to be commit 0ab98f50a7e0fe15347a99e5c29a6590a87729a0)
---
 source4/lib/ldb/common/ldb_modules.c | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 71ec3fdc00..4f53535bc4 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -57,21 +57,19 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 	pn = 0;
 
 	if (options) {
-
 		for (i = 0; options[i] != NULL; i++) {
-
-			if (strncmp(options[i], LDB_MODULE_PREFIX, LDB_MODULE_PREFIX_LEN) == 0) {
-
-				p = q = ldb_strdup(ldb, &options[i][LDB_MODULE_PREFIX_LEN]);
+			if (strncmp(options[i], LDB_MODULE_PREFIX, 
+				    LDB_MODULE_PREFIX_LEN) == 0) {
+				p = q = talloc_strdup(ldb, &options[i][LDB_MODULE_PREFIX_LEN]);
 				if (*q != ':') {
-					ldb_free(ldb, q);
+					talloc_free(q);
 					return -1;
 				}
 				do {
 					*p = '\0';
 					q = p + 1;
 					pn++;
-					modules = ldb_realloc_array(ldb, modules, sizeof(char *), pn);
+					modules = talloc_realloc_p(ldb, modules, char *, pn);
 					if (!modules) {
 						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in register_modules()\n");
 						return -1;
@@ -82,10 +80,12 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		}
 	}
 
-	if (!modules && strcmp("ldap", ldb->modules->ops->name)) { /* no modules in the options, look for @MODULES in the db (not for ldap) */
+	if (!modules && strcmp("ldap", ldb->modules->ops->name)) { 
+		/* no modules in the options, look for @MODULES in the
+		   db (not for ldap) */
 		int ret, j, k;
 		const char * const attrs[] = { "@MODULE" , NULL};
-		struct ldb_message **msg;
+		struct ldb_message **msg = NULL;
 
 		ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", attrs, &msg);
 		if (ret == 0) {
@@ -103,12 +103,12 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			for (j = 0; j < msg[0]->num_elements; j++) {
 				for (k = 0; k < msg[0]->elements[j].num_values; k++) {
 					pn++;
-					modules = ldb_realloc_array(ldb, modules, sizeof(char *), pn);
+					modules = talloc_realloc_p(ldb, modules, char *, pn);
 					if (!modules) {
 						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in register_modules()\n");
 						return -1;
 					}
-					modules[pn - 1] = ldb_strndup(ldb, msg[0]->elements[j].values[k].data, msg[0]->elements[j].values[k].length);
+					modules[pn - 1] = talloc_strndup(modules, msg[0]->elements[j].values[k].data, msg[0]->elements[j].values[k].length);
 					if (!modules[pn - 1]) {
 						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in register_modules()\n");
 						return -1;
@@ -116,13 +116,11 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				}
 			}
 		}
-		ldb_search_free(ldb, msg);
+		talloc_free(msg);
 	}
 
 	if (modules) {
-
 		for (i = 0; i < pn; i++) {
-
 			if (strcmp(modules[i], "timestamps") == 0) {
 				current = timestamps_module_init(ldb, options);
 				if (!current) {
@@ -274,10 +272,3 @@ const char *ldb_next_errstring(struct ldb_module *module)
 	return module->next->ops->errstring(module->next);
 }
 
-void ldb_next_cache_free(struct ldb_module *module)
-{
-	if (!module->next) {
-		return;
-	}
-	module->next->ops->cache_free(module->next);
-}
-- 
cgit 


From b92afa3838ba14fbe66bb683949a7f3bce946faa Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 3 Jan 2005 14:05:47 +0000
Subject: r4505: Add a first very basic schema module To use it you should
 provide a schema.ldb file where the schema is stored and load the module in
 the ldb you want to have schema check activated

more info soon.

currently schema checks are performed only on new object creation not on modifications

Simo.
(This used to be commit b8bb62f14419efd434a344606fb3f753384761a0)
---
 source4/lib/ldb/common/ldb_modules.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 4f53535bc4..033717a62b 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -130,7 +130,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				DLIST_ADD(ldb->modules, current);
 				continue;
 			}
-#if 0
+
 			if (strcmp(modules[i], "schema") == 0) {
 				current = schema_module_init(ldb, options);
 				if (!current) {
@@ -140,7 +140,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				DLIST_ADD(ldb->modules, current);
 				continue;
 			}
-#endif
+
 #ifdef HAVE_DLOPEN_DISABLED
 		{
 			void *handle;
-- 
cgit 


From a2f77f979d7271a9708ed06f43b00ffb10ec7f4c Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 12 Jan 2005 16:00:01 +0000
Subject: r4714: move the ldb code to the new talloc interface (eg remove _p
 suffix) this helps standalone building of ldb

renew the schema module
split code into functions to improve readability and code reuse

add and modify works correctly but we need a proper testsuite

Simo
(This used to be commit a681ae365ff1b5a2771b42ebd90336651ce1e513)
---
 source4/lib/ldb/common/ldb_modules.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 033717a62b..22d1ce112e 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -69,7 +69,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 					*p = '\0';
 					q = p + 1;
 					pn++;
-					modules = talloc_realloc_p(ldb, modules, char *, pn);
+					modules = talloc_realloc(ldb, modules, char *, pn);
 					if (!modules) {
 						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in register_modules()\n");
 						return -1;
@@ -103,7 +103,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			for (j = 0; j < msg[0]->num_elements; j++) {
 				for (k = 0; k < msg[0]->elements[j].num_values; k++) {
 					pn++;
-					modules = talloc_realloc_p(ldb, modules, char *, pn);
+					modules = talloc_realloc(ldb, modules, char *, pn);
 					if (!modules) {
 						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in register_modules()\n");
 						return -1;
-- 
cgit 


From b1b14817eaa6e6579596d54166e17bc8d5605c01 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 27 Feb 2005 11:35:47 +0000
Subject: r5585: LDB interfaces change:

changes:
- ldb_wrap disappears from code and become a private structure of db_wrap.c
  thanks to our move to talloc in ldb code, we do not need to expose it anymore

- removal of ldb_close() function form the code
  thanks to our move to talloc in ldb code, we do not need it anymore
  use talloc_free() to close and free an ldb database

- some minor updates to ldb modules code to cope with the change and fix some
  bugs I found out during the process
(This used to be commit d58be9e74b786a11a57e89df36081d55730dfe0a)
---
 source4/lib/ldb/common/ldb_modules.c | 103 +++++++++++++++++++++++++----------
 1 file changed, 74 insertions(+), 29 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 22d1ce112e..f8162aee8c 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -41,6 +41,10 @@
 #include <sys/stat.h> 
 #include <unistd.h> 
 
+#ifdef HAVE_DLOPEN_DISABLED
+#include <dlfcn.h>
+#endif
+
 #define LDB_MODULE_PREFIX	"modules"
 #define LDB_MODULE_PREFIX_LEN	7
 #define LDB_MODULE_SEP		':'
@@ -49,14 +53,15 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 {
 	struct ldb_module *current;
 	char **modules;
-	char *p, *q;
-	int pn, i;
+	int mnum, i;
 
 	/* find out which modules we are requested to activate */
 	modules = NULL;
-	pn = 0;
+	mnum = 0;
 
 	if (options) {
+		char *q, *p;
+
 		for (i = 0; options[i] != NULL; i++) {
 			if (strncmp(options[i], LDB_MODULE_PREFIX, 
 				    LDB_MODULE_PREFIX_LEN) == 0) {
@@ -68,13 +73,13 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				do {
 					*p = '\0';
 					q = p + 1;
-					pn++;
-					modules = talloc_realloc(ldb, modules, char *, pn);
+					mnum++;
+					modules = talloc_realloc(ldb, modules, char *, mnum);
 					if (!modules) {
-						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in register_modules()\n");
+						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in ldb_load_modules()\n");
 						return -1;
 					}
-					modules[pn - 1] = q;
+					modules[mnum - 1] = q;
 				} while ((p = strchr(q, LDB_MODULE_SEP)));
 			}
 		}
@@ -83,9 +88,10 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 	if (!modules && strcmp("ldap", ldb->modules->ops->name)) { 
 		/* no modules in the options, look for @MODULES in the
 		   db (not for ldap) */
-		int ret, j, k;
-		const char * const attrs[] = { "@MODULE" , NULL};
+		int ret;
+		const char * const attrs[] = { "@LIST" , NULL};
 		struct ldb_message **msg = NULL;
+		char *modstr, *c, *p; 
 
 		ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", attrs, &msg);
 		if (ret == 0) {
@@ -100,6 +106,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				return -1;
 			}
 
+/*
 			for (j = 0; j < msg[0]->num_elements; j++) {
 				for (k = 0; k < msg[0]->elements[j].num_values; k++) {
 					pn++;
@@ -115,12 +122,58 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 					}
 				}
 			}
+*/
+			modstr = msg[0]->elements[0].values[0].data;
+			for (c = modstr, mnum = 0; c != NULL; mnum++) {
+				c = strchr(c, ',');
+				if (c != NULL) {
+					c++;
+					if (*c == '\0') { /* avoid failing if the modules string lasts with ',' */
+						break;
+					}
+				}
+			}
+			
+
+			modules = talloc_array(ldb, char *, mnum);
+			if ( ! modules ) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in ldb_load_modules()\n");
+				return -1;
+			}
+
+			for (p = c = modstr, i = 0; mnum > i; i++) {
+				c = strchr(p, ',');
+				if (c) {
+					*c = '\0';
+				}
+				/* modules are seeked in inverse order. Lets place them as an admin would think the right order is */
+				modules[mnum - i - 1] = talloc_strdup(modules, p);
+				p = c + 1;
+			}
 		}
 		talloc_free(msg);
 	}
 
 	if (modules) {
-		for (i = 0; i < pn; i++) {
+		for (i = 0; i < mnum; i++) {
+#ifdef HAVE_DLOPEN_DISABLED
+			void *handle;
+			ldb_module_init_function init;
+			struct stat st;
+			char *filename;
+			const char *errstr;
+#endif
+
+			if (strcmp(modules[i], "schema") == 0) {
+				current = schema_module_init(ldb, options);
+				if (!current) {
+					ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+					return -1;
+				}
+				DLIST_ADD(ldb->modules, current);
+				continue;
+			}
+
 			if (strcmp(modules[i], "timestamps") == 0) {
 				current = timestamps_module_init(ldb, options);
 				if (!current) {
@@ -131,8 +184,8 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				continue;
 			}
 
-			if (strcmp(modules[i], "schema") == 0) {
-				current = schema_module_init(ldb, options);
+			if (strcmp(modules[i], "samldb") == 0) {
+				current = samldb_module_init(ldb, options);
 				if (!current) {
 					ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
 					return -1;
@@ -142,18 +195,18 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			}
 
 #ifdef HAVE_DLOPEN_DISABLED
-		{
-			void *handle;
-			ldb_module_init_function init;
-			struct stat st;
-			const char *errstr;
+			filename = talloc_asprintf(ldb, "%s.so", modules[i]);
+			if (!filename) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "Talloc failed!\n");
+				return -1;
+			}
 
-			if (stat(modules[i], &st) < 0) {
+			if (stat(filename, &st) < 0) {
 				ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
 				return -1;
 			}
 
-			handle = dlopen(modules[i], RTLD_LAZY);
+			handle = dlopen(filename, RTLD_LAZY);
 
 			if (!handle) {
 				ldb_debug(ldb, LDB_DEBUG_FATAL, "Error loading module %s [%s]\n", modules[i], dlerror());
@@ -174,10 +227,9 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				return -1;
 			}
 			DLIST_ADD(ldb->modules, current);
-		}
 #else
-		ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
-		return -1;
+			ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
+			return -1;
 #endif
 		}
 	}
@@ -188,13 +240,6 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 /*
    helper functions to call the next module in chain
 */
-int ldb_next_close(struct ldb_module *module)
-{
-	if (!module->next) {
-		return -1;
-	}
-	return module->next->ops->close(module->next);
-}
 
 int ldb_next_search(struct ldb_module *module, 
 	       const char *base,
-- 
cgit 


From ec97506a51bf211409dedd6f14b5a40267879c94 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 5 Mar 2005 21:59:02 +0000
Subject: r5664: simo, please look into this. It is possible for the number of
 elements in msg[0] to be 0, in which case we crash. This is a workaround.

Also, if you could please split up this function into readable
pieces. It's a bit of a mess at the moment.
(This used to be commit 19a22f78c28a4b265f59df1b43c1bb6c9e58f736)
---
 source4/lib/ldb/common/ldb_modules.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index f8162aee8c..ee70a639fa 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -94,7 +94,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		char *modstr, *c, *p; 
 
 		ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", attrs, &msg);
-		if (ret == 0) {
+		if (ret == 0 || (ret == 1 && msg[0]->num_elements == 0)) {
 			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
 		} else {
 			if (ret < 0) {
@@ -184,6 +184,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				continue;
 			}
 
+#ifdef _SAMBA_BUILD_
 			if (strcmp(modules[i], "samldb") == 0) {
 				current = samldb_module_init(ldb, options);
 				if (!current) {
@@ -193,6 +194,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				DLIST_ADD(ldb->modules, current);
 				continue;
 			}
+#endif
 
 #ifdef HAVE_DLOPEN_DISABLED
 			filename = talloc_asprintf(ldb, "%s.so", modules[i]);
-- 
cgit 


From 0b4c61a05a9a070db489986fda5c57697cfd092a Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 6 Mar 2005 15:33:40 +0000
Subject: r5670: simplify and clarify ldb_modules.c code rectify the test
 schema correct a glitch in schema module (This used to be commit
 0579b5f7adfe160be8ecf124934b6593a02ed06f)

---
 source4/lib/ldb/common/ldb_modules.c | 282 ++++++++++++++++++-----------------
 1 file changed, 147 insertions(+), 135 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index ee70a639fa..40d2cd064a 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -45,53 +45,100 @@
 #include <dlfcn.h>
 #endif
 
-#define LDB_MODULE_PREFIX	"modules"
-#define LDB_MODULE_PREFIX_LEN	7
-#define LDB_MODULE_SEP		':'
+#define LDB_MODULE_PREFIX	"modules:"
+#define LDB_MODULE_PREFIX_LEN	8
+
+static char *talloc_strdup_no_spaces(struct ldb_context *ldb, const char *string)
+{
+	int i, len;
+	char *trimmed;
+
+	trimmed = talloc_strdup(ldb, string);
+	if (!trimmed) {
+		ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in talloc_strdup_trim_spaces()\n");
+		return NULL;
+	}
+
+	len = strlen(trimmed);
+	for (i = 0; trimmed[i] != '\0'; i++) {
+		switch (trimmed[i]) {
+		case ' ':
+		case '\t':
+		case '\n':
+			memmove(&trimmed[i], &trimmed[i + 1], len -i -1);
+			break;
+		}
+	}
+
+	return trimmed;
+}
+
+
+/* modules are called in inverse order on the stack.
+   Lets place them as an admin would think the right order is.
+   Modules order is imprtant */
+static char **ldb_modules_list_from_string(struct ldb_context *ldb, const char *string)
+{
+	char **modules = NULL;
+	char *modstr, *p;
+	int i;
+
+	/* spaces not admitted */
+	modstr = talloc_strdup_no_spaces(ldb, string);
+	if ( ! modstr) {
+		return NULL;
+	}
+
+	modules = talloc_realloc(ldb, modules, char *, 2);
+	if ( ! modules ) {
+		ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in ldb_modules_list_from_string()\n");
+		talloc_free(modstr);
+		return NULL;
+	}
+	talloc_steal(modules, modstr);
+
+	i = 0;
+	while ((p = strrchr(modstr, ',')) != NULL) {
+		*p = '\0';
+		p++;
+		modules[i] = p;
+
+		i++;
+		modules = talloc_realloc(ldb, modules, char *, i + 2);
+		if ( ! modules ) {
+			ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in ldb_modules_list_from_string()\n");
+			return NULL;
+		}
+
+	}
+	modules[i] = modstr;
+
+	modules[i + 1] = NULL;
+
+	return modules;
+}
 
 int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 {
-	struct ldb_module *current;
-	char **modules;
-	int mnum, i;
+	char **modules = NULL;
+	int i;
 
 	/* find out which modules we are requested to activate */
-	modules = NULL;
-	mnum = 0;
 
+	/* check if we have a custom module list passd as ldb option */
 	if (options) {
-		char *q, *p;
-
 		for (i = 0; options[i] != NULL; i++) {
-			if (strncmp(options[i], LDB_MODULE_PREFIX, 
-				    LDB_MODULE_PREFIX_LEN) == 0) {
-				p = q = talloc_strdup(ldb, &options[i][LDB_MODULE_PREFIX_LEN]);
-				if (*q != ':') {
-					talloc_free(q);
-					return -1;
-				}
-				do {
-					*p = '\0';
-					q = p + 1;
-					mnum++;
-					modules = talloc_realloc(ldb, modules, char *, mnum);
-					if (!modules) {
-						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in ldb_load_modules()\n");
-						return -1;
-					}
-					modules[mnum - 1] = q;
-				} while ((p = strchr(q, LDB_MODULE_SEP)));
+			if (strncmp(options[i], LDB_MODULE_PREFIX, LDB_MODULE_PREFIX_LEN) == 0) {
+				modules = ldb_modules_list_from_string(ldb, &options[i][LDB_MODULE_PREFIX_LEN]);
 			}
 		}
 	}
 
-	if (!modules && strcmp("ldap", ldb->modules->ops->name)) { 
-		/* no modules in the options, look for @MODULES in the
-		   db (not for ldap) */
+	/* if not overloaded by options and the backend is not ldap try to load the modules list form ldb */
+	if ((modules == NULL) && (strcmp("ldap", ldb->modules->ops->name) != 0)) { 
 		int ret;
 		const char * const attrs[] = { "@LIST" , NULL};
 		struct ldb_message **msg = NULL;
-		char *modstr, *c, *p; 
 
 		ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", attrs, &msg);
 		if (ret == 0 || (ret == 1 && msg[0]->num_elements == 0)) {
@@ -103,139 +150,104 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			}
 			if (ret > 1) {
 				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found, bailing out\n");
+				talloc_free(msg);
 				return -1;
 			}
 
-/*
-			for (j = 0; j < msg[0]->num_elements; j++) {
-				for (k = 0; k < msg[0]->elements[j].num_values; k++) {
-					pn++;
-					modules = talloc_realloc(ldb, modules, char *, pn);
-					if (!modules) {
-						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in register_modules()\n");
-						return -1;
-					}
-					modules[pn - 1] = talloc_strndup(modules, msg[0]->elements[j].values[k].data, msg[0]->elements[j].values[k].length);
-					if (!modules[pn - 1]) {
-						ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in register_modules()\n");
-						return -1;
-					}
-				}
-			}
-*/
-			modstr = msg[0]->elements[0].values[0].data;
-			for (c = modstr, mnum = 0; c != NULL; mnum++) {
-				c = strchr(c, ',');
-				if (c != NULL) {
-					c++;
-					if (*c == '\0') { /* avoid failing if the modules string lasts with ',' */
-						break;
-					}
-				}
-			}
-			
-
-			modules = talloc_array(ldb, char *, mnum);
-			if ( ! modules ) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in ldb_load_modules()\n");
-				return -1;
-			}
+			modules = ldb_modules_list_from_string(ldb, msg[0]->elements[0].values[0].data);
 
-			for (p = c = modstr, i = 0; mnum > i; i++) {
-				c = strchr(p, ',');
-				if (c) {
-					*c = '\0';
-				}
-				/* modules are seeked in inverse order. Lets place them as an admin would think the right order is */
-				modules[mnum - i - 1] = talloc_strdup(modules, p);
-				p = c + 1;
-			}
 		}
+
 		talloc_free(msg);
 	}
 
-	if (modules) {
-		for (i = 0; i < mnum; i++) {
+	if (modules == NULL) {
+		ldb_debug(ldb, LDB_DEBUG_TRACE, "No modules specified for this database\n");
+		return 0;
+	}
+
+	for (i = 0; modules[i] != NULL; i++) {
 #ifdef HAVE_DLOPEN_DISABLED
-			void *handle;
-			ldb_module_init_function init;
-			struct stat st;
-			char *filename;
-			const char *errstr;
+		void *handle;
+		ldb_module_init_function init;
+		struct stat st;
+		char *filename;
+		const char *errstr;
 #endif
+		struct ldb_module *current;
 
-			if (strcmp(modules[i], "schema") == 0) {
-				current = schema_module_init(ldb, options);
-				if (!current) {
-					ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-					return -1;
-				}
-				DLIST_ADD(ldb->modules, current);
-				continue;
+		if (strcmp(modules[i], "schema") == 0) {
+			current = schema_module_init(ldb, options);
+			if (!current) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+				return -1;
 			}
+			DLIST_ADD(ldb->modules, current);
+			continue;
+		}
 
-			if (strcmp(modules[i], "timestamps") == 0) {
-				current = timestamps_module_init(ldb, options);
-				if (!current) {
-					ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-					return -1;
-				}
-				DLIST_ADD(ldb->modules, current);
-				continue;
+		if (strcmp(modules[i], "timestamps") == 0) {
+			current = timestamps_module_init(ldb, options);
+			if (!current) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+				return -1;
 			}
+			DLIST_ADD(ldb->modules, current);
+			continue;
+		}
 
 #ifdef _SAMBA_BUILD_
-			if (strcmp(modules[i], "samldb") == 0) {
-				current = samldb_module_init(ldb, options);
-				if (!current) {
-					ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-					return -1;
-				}
-				DLIST_ADD(ldb->modules, current);
-				continue;
+		if (strcmp(modules[i], "samldb") == 0) {
+			current = samldb_module_init(ldb, options);
+			if (!current) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+				return -1;
 			}
+			DLIST_ADD(ldb->modules, current);
+			continue;
+		}
 #endif
 
 #ifdef HAVE_DLOPEN_DISABLED
-			filename = talloc_asprintf(ldb, "%s.so", modules[i]);
-			if (!filename) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "Talloc failed!\n");
-				return -1;
-			}
+		filename = talloc_asprintf(ldb, "%s.so", modules[i]);
+		if (!filename) {
+			ldb_debug(ldb, LDB_DEBUG_FATAL, "Talloc failed!\n");
+			return -1;
+		}
 
-			if (stat(filename, &st) < 0) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
-				return -1;
-			}
+		if (stat(filename, &st) < 0) {
+			ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
+			return -1;
+		}
 
-			handle = dlopen(filename, RTLD_LAZY);
+		handle = dlopen(filename, RTLD_LAZY);
 
-			if (!handle) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "Error loading module %s [%s]\n", modules[i], dlerror());
-				return -1;
-			}
+		if (!handle) {
+			ldb_debug(ldb, LDB_DEBUG_FATAL, "Error loading module %s [%s]\n", modules[i], dlerror());
+			return -1;
+		}
 
-			init = (ldb_module_init_function)dlsym(handle, "init_module");
+		init = (ldb_module_init_function)dlsym(handle, "init_module");
 
-			errstr = dlerror();
-			if (errstr) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "Error trying to resolve symbol 'init_module' in %s [%s]\n", modules[i], errstr);
-				return -1;
-			}
+		errstr = dlerror();
+		if (errstr) {
+			ldb_debug(ldb, LDB_DEBUG_FATAL, "Error trying to resolve symbol 'init_module' in %s [%s]\n", modules[i], errstr);
+			return -1;
+		}
 
-			current = init(ldb, options);
-			if (!current) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-				return -1;
-			}
-			DLIST_ADD(ldb->modules, current);
-#else
-			ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
+		current = init(ldb, options);
+		if (!current) {
+			ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
 			return -1;
-#endif
 		}
+		DLIST_ADD(ldb->modules, current);
+#else
+		ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
+		return -1;
+#endif
 	}
 
+	talloc_free(modules);
 	return 0; 
 }
 
-- 
cgit 


From a5ee5aae6921b844f142d3a5dd67c188612723d7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 28 Mar 2005 00:40:18 +0000
Subject: r6087: - remove the dlopen code for now (before it goes back, it
 needs to be   made into something that isn't a maze of #ifdefs)

- when a module is not found, make it a non-fatal error. Otherwise the standalone ldb
  tools just bail out. The previous code meant that if you had a
  module listed and it wasn't present then you could _never_ fix it,
  as you coudln't open the ldb to remove that module from @MODULES !
(This used to be commit c4728625c093d91e522b80c049e0d42d2b5f143b)
---
 source4/lib/ldb/common/ldb_modules.c | 45 +-----------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 40d2cd064a..ffa150d773 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -167,13 +167,6 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 	}
 
 	for (i = 0; modules[i] != NULL; i++) {
-#ifdef HAVE_DLOPEN_DISABLED
-		void *handle;
-		ldb_module_init_function init;
-		struct stat st;
-		char *filename;
-		const char *errstr;
-#endif
 		struct ldb_module *current;
 
 		if (strcmp(modules[i], "schema") == 0) {
@@ -208,43 +201,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		}
 #endif
 
-#ifdef HAVE_DLOPEN_DISABLED
-		filename = talloc_asprintf(ldb, "%s.so", modules[i]);
-		if (!filename) {
-			ldb_debug(ldb, LDB_DEBUG_FATAL, "Talloc failed!\n");
-			return -1;
-		}
-
-		if (stat(filename, &st) < 0) {
-			ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
-			return -1;
-		}
-
-		handle = dlopen(filename, RTLD_LAZY);
-
-		if (!handle) {
-			ldb_debug(ldb, LDB_DEBUG_FATAL, "Error loading module %s [%s]\n", modules[i], dlerror());
-			return -1;
-		}
-
-		init = (ldb_module_init_function)dlsym(handle, "init_module");
-
-		errstr = dlerror();
-		if (errstr) {
-			ldb_debug(ldb, LDB_DEBUG_FATAL, "Error trying to resolve symbol 'init_module' in %s [%s]\n", modules[i], errstr);
-			return -1;
-		}
-
-		current = init(ldb, options);
-		if (!current) {
-			ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-			return -1;
-		}
-		DLIST_ADD(ldb->modules, current);
-#else
-		ldb_debug(ldb, LDB_DEBUG_FATAL, "Required module [%s] not found, bailing out!\n", modules[i]);
-		return -1;
-#endif
+		ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", modules[i]);
 	}
 
 	talloc_free(modules);
-- 
cgit 


From fe4d985b6f3d318d9b58a16677be3b4ae34fba15 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 25 Apr 2005 12:46:18 +0000
Subject: r6470: Remove ldb_search_free() it is not needed anymore. Just use
 talloc_free() to release the memory after an ldb_search(). (This used to be
 commit 4f0948dab0aa5e8b6a4ce486f3668ca8dfae23db)

---
 source4/lib/ldb/common/ldb_modules.c | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index ffa150d773..644154d645 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -224,14 +224,6 @@ int ldb_next_search(struct ldb_module *module,
 	return module->next->ops->search(module->next, base, scope, expression, attrs, res);
 }
 
-int ldb_next_search_free(struct ldb_module *module, struct ldb_message **msg)
-{
-	if (!module->next) {
-		return -1;
-	}
-	return module->next->ops->search_free(module->next, msg);
-}
-
 int ldb_next_add_record(struct ldb_module *module, const struct ldb_message *message)
 {
 	if (!module->next) {
-- 
cgit 


From 4b0e5bd75373ffa2d847706a71fd0349dfa15e71 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 13 Jun 2005 09:10:17 +0000
Subject: 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)
---
 source4/lib/ldb/common/ldb_modules.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 644154d645..7df9901ae9 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -213,10 +213,10 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 */
 
 int ldb_next_search(struct ldb_module *module, 
-	       const char *base,
-	       enum ldb_scope scope,
-	       const char *expression,
-	       const char * const *attrs, struct ldb_message ***res)
+		    const char *base,
+		    enum ldb_scope scope,
+		    const char *expression,
+		    const char * const *attrs, struct ldb_message ***res)
 {
 	if (!module->next) {
 		return -1;
@@ -224,6 +224,18 @@ int ldb_next_search(struct ldb_module *module,
 	return module->next->ops->search(module->next, base, scope, expression, attrs, res);
 }
 
+int ldb_next_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)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->search_bytree(module->next, base, scope, tree, attrs, res);
+}
+
 int ldb_next_add_record(struct ldb_module *module, const struct ldb_message *message)
 {
 	if (!module->next) {
-- 
cgit 


From 9378cca1aeda2f12a997cd6017d6d983a20e34bf Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 15 Jun 2005 13:01:39 +0000
Subject: r7608: bug fix after yesterday's change (This used to be commit
 0218fc678e375a05fbc4da5500706199340918e2)

---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 7df9901ae9..d4f35c0e56 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -140,7 +140,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		const char * const attrs[] = { "@LIST" , NULL};
 		struct ldb_message **msg = NULL;
 
-		ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", attrs, &msg);
+		ret = ldb_search(ldb, "@MODULES", LDB_SCOPE_BASE, "", attrs, &msg);
 		if (ret == 0 || (ret == 1 && msg[0]->num_elements == 0)) {
 			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
 		} else {
-- 
cgit 


From 24d2107324982d8ad69fb89d13037ba591f49534 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 20 Jul 2005 11:43:23 +0000
Subject: r8650: Use the timestamps and a new objectguid module rather than
 placing boilerplate attributes in every entry in provision.ldif.

The next step will be to use templates.

Andrew Bartlett
(This used to be commit 940ed9827f5ab83b668a60a2b0110567dd54c3e2)
---
 source4/lib/ldb/common/ldb_modules.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index d4f35c0e56..dc1a90ebc2 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -189,6 +189,16 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			continue;
 		}
 
+		if (strcmp(modules[i], "objectguid") == 0) {
+			current = objectguid_module_init(ldb, options);
+			if (!current) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+				return -1;
+			}
+			DLIST_ADD(ldb->modules, current);
+			continue;
+		}
+
 #ifdef _SAMBA_BUILD_
 		if (strcmp(modules[i], "samldb") == 0) {
 			current = samldb_module_init(ldb, options);
-- 
cgit 


From 2a0cf520e3255d8e1bdec1bedd710489619de614 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 21 Jul 2005 07:59:01 +0000
Subject: r8667: Further simply the provision script, by removing the 'name'
 attribute.

This is now calculated on the fly for every add and modify.

Andrew Bartlett
(This used to be commit ed1f2e029c840d2b3ecb49dbe6e8cd67588eeeed)
---
 source4/lib/ldb/common/ldb_modules.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index dc1a90ebc2..d6213be79a 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -199,6 +199,16 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			continue;
 		}
 
+		if (strcmp(modules[i], "rdn_name") == 0) {
+			current = rdn_name_module_init(ldb, options);
+			if (!current) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+				return -1;
+			}
+			DLIST_ADD(ldb->modules, current);
+			continue;
+		}
+
 #ifdef _SAMBA_BUILD_
 		if (strcmp(modules[i], "samldb") == 0) {
 			current = samldb_module_init(ldb, options);
-- 
cgit 


From 4396d0d1482d4033a469f7a3e3835a6f3b145046 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 21 Jul 2005 08:32:07 +0000
Subject: r8669: The objectguid module belongs in Samba's ldb module
 collection, not in ldb, as it can't build without the NDR and GUID code.

Also make it properly use the NDR encoding for the GUID (I forgot last
time, and used a string), as well as set the dependencies on the
module correctly.

Andrew Bartlett
(This used to be commit 8054abc76e5e3588cebc7fc01062a1223b7f140b)
---
 source4/lib/ldb/common/ldb_modules.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index d6213be79a..dcc384ffad 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -189,8 +189,8 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			continue;
 		}
 
-		if (strcmp(modules[i], "objectguid") == 0) {
-			current = objectguid_module_init(ldb, options);
+		if (strcmp(modules[i], "rdn_name") == 0) {
+			current = rdn_name_module_init(ldb, options);
 			if (!current) {
 				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
 				return -1;
@@ -199,8 +199,9 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			continue;
 		}
 
-		if (strcmp(modules[i], "rdn_name") == 0) {
-			current = rdn_name_module_init(ldb, options);
+#ifdef _SAMBA_BUILD_
+		if (strcmp(modules[i], "objectguid") == 0) {
+			current = objectguid_module_init(ldb, options);
 			if (!current) {
 				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
 				return -1;
@@ -209,7 +210,6 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			continue;
 		}
 
-#ifdef _SAMBA_BUILD_
 		if (strcmp(modules[i], "samldb") == 0) {
 			current = samldb_module_init(ldb, options);
 			if (!current) {
-- 
cgit 


From 3e4c4cff2177af33efdb15f03a1bbcb639505cee Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Thu, 18 Aug 2005 15:02:01 +0000
Subject: 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)

---
 source4/lib/ldb/common/ldb_modules.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index dcc384ffad..ab743d1b49 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -139,8 +139,15 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		int ret;
 		const char * const attrs[] = { "@LIST" , NULL};
 		struct ldb_message **msg = NULL;
+		struct ldb_dn *mods;
 
-		ret = ldb_search(ldb, "@MODULES", LDB_SCOPE_BASE, "", attrs, &msg);
+		mods = ldb_dn_explode(ldb, "@MODULES");
+		if (mods == NULL) {
+			return -1;
+		}
+
+		ret = ldb_search(ldb, mods, LDB_SCOPE_BASE, "", attrs, &msg);
+		talloc_free(mods);
 		if (ret == 0 || (ret == 1 && msg[0]->num_elements == 0)) {
 			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
 		} else {
@@ -233,7 +240,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 */
 
 int ldb_next_search(struct ldb_module *module, 
-		    const char *base,
+		    const struct ldb_dn *base,
 		    enum ldb_scope scope,
 		    const char *expression,
 		    const char * const *attrs, struct ldb_message ***res)
@@ -245,7 +252,7 @@ int ldb_next_search(struct ldb_module *module,
 }
 
 int ldb_next_search_bytree(struct ldb_module *module, 
-			   const char *base,
+			   const struct ldb_dn *base,
 			   enum ldb_scope scope,
 			   struct ldb_parse_tree *tree,
 			   const char * const *attrs, struct ldb_message ***res)
@@ -272,7 +279,7 @@ int ldb_next_modify_record(struct ldb_module *module, const struct ldb_message *
 	return module->next->ops->modify_record(module->next, message);
 }
 
-int ldb_next_delete_record(struct ldb_module *module, const char *dn)
+int ldb_next_delete_record(struct ldb_module *module, const struct ldb_dn *dn)
 {
 	if (!module->next) {
 		return -1;
@@ -280,7 +287,7 @@ int ldb_next_delete_record(struct ldb_module *module, const char *dn)
 	return module->next->ops->delete_record(module->next, dn);
 }
 
-int ldb_next_rename_record(struct ldb_module *module, const char *olddn, const char *newdn)
+int ldb_next_rename_record(struct ldb_module *module, const struct ldb_dn *olddn, const struct ldb_dn *newdn)
 {
 	if (!module->next) {
 		return -1;
-- 
cgit 


From 7e3838dd2d8647e9c621a08c61a2a22ef1d94bb2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 27 Aug 2005 15:13:15 +0000
Subject: r9685: Add tests for samba3sam mapping module Fix a couple of bugs
 Move samba3sam backend to lib/ldb/ Remove some more unused parameters (This
 used to be commit 7f864d446d6af7cfd9fb8dbc496a29b36ec57ce9)

---
 source4/lib/ldb/common/ldb_modules.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index ab743d1b49..20e8ad061e 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -226,6 +226,17 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			DLIST_ADD(ldb->modules, current);
 			continue;
 		}
+
+		if (strcmp(modules[i], "samba3sam") == 0) {
+			current = ldb_samba3sam_module_init(ldb, options);
+			if (!current) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+				return -1;
+			}
+			DLIST_ADD(ldb->modules, current);
+			continue;
+		}
+
 #endif
 
 		ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", modules[i]);
-- 
cgit 


From 8919d6bf9a88ce9ac43dae61989c33082c984b66 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 17 Sep 2005 19:25:50 +0000
Subject: r10299: remove the public (un)lock functions and introduce a
 transaction based private ldb API

ldb_sqlite3 is already working with this model and ldb_tdb will do
as soon as tridge finishes the tdb transaction code.

currently the transactions are always implicit and wrap any single
ldb API call except searching, the transaction functions are
currently not made public on purpose.

Simo.
(This used to be commit 1da4ac2cdcb7e54076f85242a93784260dced918)
---
 source4/lib/ldb/common/ldb_modules.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 20e8ad061e..29bc8264e9 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -306,20 +306,20 @@ int ldb_next_rename_record(struct ldb_module *module, const struct ldb_dn *olddn
 	return module->next->ops->rename_record(module->next, olddn, newdn);
 }
 
-int ldb_next_named_lock(struct ldb_module *module, const char *lockname)
+int ldb_next_start_trans(struct ldb_module *module)
 {
 	if (!module->next) {
 		return -1;
 	}
-	return module->next->ops->named_lock(module->next, lockname);
+	return module->next->ops->start_transaction(module->next);
 }
 
-int ldb_next_named_unlock(struct ldb_module *module, const char *lockname)
+int ldb_next_end_trans(struct ldb_module *module, int status)
 {
 	if (!module->next) {
 		return -1;
 	}
-	return module->next->ops->named_unlock(module->next, lockname);
+	return module->next->ops->end_transaction(module->next, status);
 }
 
 const char *ldb_next_errstring(struct ldb_module *module)
-- 
cgit 


From 16aff2a184f7fab64d718b356056070e305e99e9 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 18 Sep 2005 18:49:06 +0000
Subject: r10305: start implementing better error handling

changed the prioivate modules API
error string are now not spread over all
modules but are kept in  a single place.

This allows a better control of memory
and error reporting.
(This used to be commit 3fc676ac1d6f59d08bedbbd9377986154cf84ce4)
---
 source4/lib/ldb/common/ldb_modules.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 29bc8264e9..e1f5b83083 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -322,11 +322,12 @@ int ldb_next_end_trans(struct ldb_module *module, int status)
 	return module->next->ops->end_transaction(module->next, status);
 }
 
-const char *ldb_next_errstring(struct ldb_module *module)
+void ldb_set_errstring(struct ldb_module *module, char *err_string)
 {
-	if (!module->next) {
-		return NULL;
+	if (module->ldb->err_string) {
+		talloc_free(module->ldb->err_string);
 	}
-	return module->next->ops->errstring(module->next);
+
+	module->ldb->err_string = err_string;
 }
 
-- 
cgit 


From 63b43dd12fb579aaaccedd07aaa630cb1cd7aa88 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 24 Sep 2005 15:42:15 +0000
Subject: r10477: expose transactions outside ldb and change the API once more
 do not autostart transactions on ldb operations if a transaction is already
 in place test transactions on winsdb

all my tests passes so far
tridge please confirm this is ok for you
(This used to be commit c2bb2a36bdbe0ec7519697a9a9ba7526a0defac2)
---
 source4/lib/ldb/common/ldb_modules.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index e1f5b83083..6802cc8955 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -314,12 +314,20 @@ int ldb_next_start_trans(struct ldb_module *module)
 	return module->next->ops->start_transaction(module->next);
 }
 
-int ldb_next_end_trans(struct ldb_module *module, int status)
+int ldb_next_end_trans(struct ldb_module *module)
 {
 	if (!module->next) {
 		return -1;
 	}
-	return module->next->ops->end_transaction(module->next, status);
+	return module->next->ops->end_transaction(module->next);
+}
+
+int ldb_next_del_trans(struct ldb_module *module)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->del_transaction(module->next);
 }
 
 void ldb_set_errstring(struct ldb_module *module, char *err_string)
-- 
cgit 


From 0e90afb4e7737d60d902aee1df4cbeb85a7b693d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 29 Sep 2005 10:18:26 +0000
Subject: r10603: neaten up the ldb module initialisation code (This used to be
 commit 8e7c4c98a7b4fd814f298fba1b6b686cb58339f8)

---
 source4/lib/ldb/common/ldb_modules.c | 92 ++++++++++++------------------------
 1 file changed, 29 insertions(+), 63 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 6802cc8955..9c536789b9 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -122,6 +122,20 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 {
 	char **modules = NULL;
 	int i;
+	struct {
+		const char *name;
+		ldb_module_init_t init;
+	} well_known_modules[] = {
+		{ "schema", schema_module_init },
+		{ "timestamps", timestamps_module_init },
+		{ "rdn_name", rdn_name_module_init },
+#ifdef _SAMBA_BUILD_
+		{ "objectguid", objectguid_module_init },
+		{ "samldb", samldb_module_init },
+		{ "samba3sam", ldb_samba3sam_module_init },
+#endif
+		{ NULL, NULL }
+	};
 
 	/* find out which modules we are requested to activate */
 
@@ -161,7 +175,8 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				return -1;
 			}
 
-			modules = ldb_modules_list_from_string(ldb, msg[0]->elements[0].values[0].data);
+			modules = ldb_modules_list_from_string(ldb, 
+							       (const char *)msg[0]->elements[0].values[0].data);
 
 		}
 
@@ -175,71 +190,22 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 
 	for (i = 0; modules[i] != NULL; i++) {
 		struct ldb_module *current;
-
-		if (strcmp(modules[i], "schema") == 0) {
-			current = schema_module_init(ldb, options);
-			if (!current) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-				return -1;
-			}
-			DLIST_ADD(ldb->modules, current);
-			continue;
-		}
-
-		if (strcmp(modules[i], "timestamps") == 0) {
-			current = timestamps_module_init(ldb, options);
-			if (!current) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-				return -1;
+		int m;
+		for (m=0;well_known_modules[m].name;m++) {
+			if (strcmp(modules[i], well_known_modules[m].name) == 0) {
+				current = well_known_modules[m].init(ldb, options);
+				if (current == NULL) {
+					ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
+					return -1;
+				}
+				DLIST_ADD(ldb->modules, current);
+				break;
 			}
-			DLIST_ADD(ldb->modules, current);
-			continue;
 		}
-
-		if (strcmp(modules[i], "rdn_name") == 0) {
-			current = rdn_name_module_init(ldb, options);
-			if (!current) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-				return -1;
-			}
-			DLIST_ADD(ldb->modules, current);
-			continue;
+		if (well_known_modules[m].name == NULL) {
+			ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", 
+				  modules[i]);
 		}
-
-#ifdef _SAMBA_BUILD_
-		if (strcmp(modules[i], "objectguid") == 0) {
-			current = objectguid_module_init(ldb, options);
-			if (!current) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-				return -1;
-			}
-			DLIST_ADD(ldb->modules, current);
-			continue;
-		}
-
-		if (strcmp(modules[i], "samldb") == 0) {
-			current = samldb_module_init(ldb, options);
-			if (!current) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-				return -1;
-			}
-			DLIST_ADD(ldb->modules, current);
-			continue;
-		}
-
-		if (strcmp(modules[i], "samba3sam") == 0) {
-			current = ldb_samba3sam_module_init(ldb, options);
-			if (!current) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-				return -1;
-			}
-			DLIST_ADD(ldb->modules, current);
-			continue;
-		}
-
-#endif
-
-		ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", modules[i]);
 	}
 
 	talloc_free(modules);
-- 
cgit 


From 5fd031c97daaa1bf09a7ad80550753acd434075f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 6 Oct 2005 05:24:46 +0000
Subject: r10753: don't require every ldb module to implement both a
 search_bytree() and a search() function, instead each module now only
 implements the bytree method, and the expression based search is handled
 generically by the modules code. This makes for more consistency and less
 code duplication.

fixed the tdb backend to handle BASE searches much more
efficiently. They now always only lookup one record, regardless of the
search expression
(This used to be commit 7e44f9153c5578624e2fca04cdc0a00af0fd9eb4)
---
 source4/lib/ldb/common/ldb_modules.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 9c536789b9..2885d46b37 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -133,6 +133,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		{ "objectguid", objectguid_module_init },
 		{ "samldb", samldb_module_init },
 		{ "samba3sam", ldb_samba3sam_module_init },
+		{ "proxy", proxy_module_init },
 #endif
 		{ NULL, NULL }
 	};
@@ -170,7 +171,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				return -1;
 			}
 			if (ret > 1) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found, bailing out\n");
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%d), bailing out\n", ret);
 				talloc_free(msg);
 				return -1;
 			}
@@ -215,6 +216,17 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 /*
    helper functions to call the next module in chain
 */
+int ldb_next_search_bytree(struct ldb_module *module, 
+			   const struct ldb_dn *base,
+			   enum ldb_scope scope,
+			   struct ldb_parse_tree *tree,
+			   const char * const *attrs, struct ldb_message ***res)
+{
+	if (!module->next) {
+		return -1;
+	}
+	return module->next->ops->search_bytree(module->next, base, scope, tree, attrs, res);
+}
 
 int ldb_next_search(struct ldb_module *module, 
 		    const struct ldb_dn *base,
@@ -222,24 +234,22 @@ int ldb_next_search(struct ldb_module *module,
 		    const char *expression,
 		    const char * const *attrs, struct ldb_message ***res)
 {
+	struct ldb_parse_tree *tree;
+	int ret;
 	if (!module->next) {
 		return -1;
 	}
-	return module->next->ops->search(module->next, base, scope, expression, attrs, res);
-}
-
-int ldb_next_search_bytree(struct ldb_module *module, 
-			   const struct ldb_dn *base,
-			   enum ldb_scope scope,
-			   struct ldb_parse_tree *tree,
-			   const char * const *attrs, struct ldb_message ***res)
-{
-	if (!module->next) {
+	tree = ldb_parse_tree(module, expression);
+	if (tree == NULL) {
+		ldb_set_errstring(module, talloc_strdup(module, "Unable to parse search expression"));
 		return -1;
 	}
-	return module->next->ops->search_bytree(module->next, base, scope, tree, attrs, res);
+	ret = module->next->ops->search_bytree(module->next, base, scope, tree, attrs, res);
+	talloc_free(tree);
+	return ret;
 }
 
+
 int ldb_next_add_record(struct ldb_module *module, const struct ldb_message *message)
 {
 	if (!module->next) {
-- 
cgit 


From 01e6c562086b42a59fc1ac6aa1a3359747b96fe6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 6 Oct 2005 06:01:56 +0000
Subject: r10757: remove the proxy module (it is not complete yet) (This used
 to be commit 3c5f3032fcb092545580b986e0ce58bb49e4d9cb)

---
 source4/lib/ldb/common/ldb_modules.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 2885d46b37..955e46b91a 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -133,7 +133,6 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		{ "objectguid", objectguid_module_init },
 		{ "samldb", samldb_module_init },
 		{ "samba3sam", ldb_samba3sam_module_init },
-		{ "proxy", proxy_module_init },
 #endif
 		{ NULL, NULL }
 	};
-- 
cgit 


From 78d0e79c9f9263e7f3798aa2e174a347ea1a3df1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 6 Oct 2005 06:57:09 +0000
Subject: r10759: make modules easier to write by allowing modules to only
 implement the functions they care about, instead of all functions. This also
 makes it more likely that future changes to ldb will not break existing
 modules (This used to be commit 45f0c967b58e7c1b2e900a4d74cfde2a2c527dfa)

---
 source4/lib/ldb/common/ldb_modules.c | 66 ++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 36 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 955e46b91a..b0ede9893b 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -212,6 +212,18 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 	return 0; 
 }
 
+/*
+  by using this we allow ldb modules to only implement the functions they care about,
+  which makes writing a module simpler, and makes it more likely to keep working
+  when ldb is extended
+*/
+#define FIND_OP(module, op) do { \
+	module = module->next; \
+	while (module && module->ops->op == NULL) module = module->next; \
+	if (module == NULL) return -1; \
+} while (0)
+
+
 /*
    helper functions to call the next module in chain
 */
@@ -221,10 +233,8 @@ int ldb_next_search_bytree(struct ldb_module *module,
 			   struct ldb_parse_tree *tree,
 			   const char * const *attrs, struct ldb_message ***res)
 {
-	if (!module->next) {
-		return -1;
-	}
-	return module->next->ops->search_bytree(module->next, base, scope, tree, attrs, res);
+	FIND_OP(module, search_bytree);
+	return module->ops->search_bytree(module, base, scope, tree, attrs, res);
 }
 
 int ldb_next_search(struct ldb_module *module, 
@@ -235,15 +245,13 @@ int ldb_next_search(struct ldb_module *module,
 {
 	struct ldb_parse_tree *tree;
 	int ret;
-	if (!module->next) {
-		return -1;
-	}
+	FIND_OP(module, search_bytree);
 	tree = ldb_parse_tree(module, expression);
 	if (tree == NULL) {
 		ldb_set_errstring(module, talloc_strdup(module, "Unable to parse search expression"));
 		return -1;
 	}
-	ret = module->next->ops->search_bytree(module->next, base, scope, tree, attrs, res);
+	ret = module->ops->search_bytree(module, base, scope, tree, attrs, res);
 	talloc_free(tree);
 	return ret;
 }
@@ -251,58 +259,44 @@ int ldb_next_search(struct ldb_module *module,
 
 int ldb_next_add_record(struct ldb_module *module, const struct ldb_message *message)
 {
-	if (!module->next) {
-		return -1;
-	}
-	return module->next->ops->add_record(module->next, message);
+	FIND_OP(module, add_record);
+	return module->ops->add_record(module, message);
 }
 
 int ldb_next_modify_record(struct ldb_module *module, const struct ldb_message *message)
 {
-	if (!module->next) {
-		return -1;
-	}
-	return module->next->ops->modify_record(module->next, message);
+	FIND_OP(module, modify_record);
+	return module->ops->modify_record(module, message);
 }
 
 int ldb_next_delete_record(struct ldb_module *module, const struct ldb_dn *dn)
 {
-	if (!module->next) {
-		return -1;
-	}
-	return module->next->ops->delete_record(module->next, dn);
+	FIND_OP(module, delete_record);
+	return module->ops->delete_record(module, dn);
 }
 
 int ldb_next_rename_record(struct ldb_module *module, const struct ldb_dn *olddn, const struct ldb_dn *newdn)
 {
-	if (!module->next) {
-		return -1;
-	}
-	return module->next->ops->rename_record(module->next, olddn, newdn);
+	FIND_OP(module, rename_record);
+	return module->ops->rename_record(module, olddn, newdn);
 }
 
 int ldb_next_start_trans(struct ldb_module *module)
 {
-	if (!module->next) {
-		return -1;
-	}
-	return module->next->ops->start_transaction(module->next);
+	FIND_OP(module, start_transaction);
+	return module->ops->start_transaction(module);
 }
 
 int ldb_next_end_trans(struct ldb_module *module)
 {
-	if (!module->next) {
-		return -1;
-	}
-	return module->next->ops->end_transaction(module->next);
+	FIND_OP(module, end_transaction);
+	return module->ops->end_transaction(module);
 }
 
 int ldb_next_del_trans(struct ldb_module *module)
 {
-	if (!module->next) {
-		return -1;
-	}
-	return module->next->ops->del_transaction(module->next);
+	FIND_OP(module, del_transaction);
+	return module->ops->del_transaction(module);
 }
 
 void ldb_set_errstring(struct ldb_module *module, char *err_string)
-- 
cgit 


From 860ffba4e147b7c27b416df60bec587eb61ea148 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 11 Oct 2005 12:31:31 +0000
Subject: r10897: added in a hackish ldb proxy module that I am using to
 experiment with mmc management support (This used to be commit
 99a5b088810e8e2f4e28b99a4a0e5e7dc9301594)

---
 source4/lib/ldb/common/ldb_modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index b0ede9893b..5ca666c194 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -133,6 +133,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		{ "objectguid", objectguid_module_init },
 		{ "samldb", samldb_module_init },
 		{ "samba3sam", ldb_samba3sam_module_init },
+		{ "proxy", proxy_module_init },
 #endif
 		{ NULL, NULL }
 	};
-- 
cgit 


From 35720734911169acde6bf9f2c9a1f83336744f6f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 12 Oct 2005 07:57:39 +0000
Subject: r10916: - finished the 'operational' ldb module

- removed the timestamps module, replacing it with the operational module

- added a ldb_msg_copy_shallow() function which should be used when a module
  wants to add new elements to a message on add/modify. This is needed
  because the caller might be using a constant structure, or may want to
  re-use the structure again

- enabled the UTC time attribute syntaxes in the operational module
(This used to be commit 61e8b010223ac6a0573185008f3719ba29574688)
---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 5ca666c194..f3ca4df9b4 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -127,7 +127,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		ldb_module_init_t init;
 	} well_known_modules[] = {
 		{ "schema", schema_module_init },
-		{ "timestamps", timestamps_module_init },
+		{ "operational", operational_module_init },
 		{ "rdn_name", rdn_name_module_init },
 #ifdef _SAMBA_BUILD_
 		{ "objectguid", objectguid_module_init },
-- 
cgit 


From 5c9590587197dcb95007fdc54318187d5716c7c6 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Tue, 8 Nov 2005 00:11:45 +0000
Subject: r11567: Ldb API change patch.

This patch changes the way lsb_search is called and the meaning of the returned integer.
The last argument of ldb_search is changed from struct ldb_message to struct ldb_result
which contains a pointer to a struct ldb_message list and a count of the number of messages.
The return is not the count of messages anymore but instead it is an ldb error value.

I tryed to keep the patch as tiny as possible bu as you can guess I had to change a good
amount of places. I also tried to double check all my changes being sure that the calling
functions would still behave as before. But this patch is big enough that I fear some bug
may have been introduced anyway even if it passes the test suite. So if you are currently
working on any file being touched please give it a deep look and blame me for any error.

Simo.
(This used to be commit 22c8c97e6fb466b41859e090e959d7f1134be780)
---
 source4/lib/ldb/common/ldb_modules.c | 73 +++++++-----------------------------
 1 file changed, 13 insertions(+), 60 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index f3ca4df9b4..91338c2e10 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -35,6 +35,7 @@
 
 #include "includes.h"
 #include "ldb/include/ldb.h"
+#include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
 #include "dlinklist.h"
 #include <sys/types.h> 
@@ -153,7 +154,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 	if ((modules == NULL) && (strcmp("ldap", ldb->modules->ops->name) != 0)) { 
 		int ret;
 		const char * const attrs[] = { "@LIST" , NULL};
-		struct ldb_message **msg = NULL;
+		struct ldb_result *res = NULL;
 		struct ldb_dn *mods;
 
 		mods = ldb_dn_explode(ldb, "@MODULES");
@@ -161,27 +162,27 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			return -1;
 		}
 
-		ret = ldb_search(ldb, mods, LDB_SCOPE_BASE, "", attrs, &msg);
+		ret = ldb_search(ldb, mods, LDB_SCOPE_BASE, "", attrs, &res);
 		talloc_free(mods);
-		if (ret == 0 || (ret == 1 && msg[0]->num_elements == 0)) {
+		if (ret == LDB_SUCCESS && (res->count == 0 || res->msgs[0]->num_elements == 0)) {
 			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
 		} else {
-			if (ret < 0) {
+			if (ret != LDB_SUCCESS) {
 				ldb_debug(ldb, LDB_DEBUG_FATAL, "ldb error (%s) occurred searching for modules, bailing out\n", ldb_errstring(ldb));
 				return -1;
 			}
-			if (ret > 1) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%d), bailing out\n", ret);
-				talloc_free(msg);
+			if (res->count > 1) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%d), bailing out\n", res->count);
+				talloc_free(res);
 				return -1;
 			}
 
 			modules = ldb_modules_list_from_string(ldb, 
-							       (const char *)msg[0]->elements[0].values[0].data);
+							       (const char *)res->msgs[0]->elements[0].values[0].data);
 
 		}
 
-		talloc_free(msg);
+		talloc_free(res);
 	}
 
 	if (modules == NULL) {
@@ -228,58 +229,10 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 /*
    helper functions to call the next module in chain
 */
-int ldb_next_search_bytree(struct ldb_module *module, 
-			   const struct ldb_dn *base,
-			   enum ldb_scope scope,
-			   struct ldb_parse_tree *tree,
-			   const char * const *attrs, struct ldb_message ***res)
+int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
 {
-	FIND_OP(module, search_bytree);
-	return module->ops->search_bytree(module, base, scope, tree, attrs, res);
-}
-
-int ldb_next_search(struct ldb_module *module, 
-		    const struct ldb_dn *base,
-		    enum ldb_scope scope,
-		    const char *expression,
-		    const char * const *attrs, struct ldb_message ***res)
-{
-	struct ldb_parse_tree *tree;
-	int ret;
-	FIND_OP(module, search_bytree);
-	tree = ldb_parse_tree(module, expression);
-	if (tree == NULL) {
-		ldb_set_errstring(module, talloc_strdup(module, "Unable to parse search expression"));
-		return -1;
-	}
-	ret = module->ops->search_bytree(module, base, scope, tree, attrs, res);
-	talloc_free(tree);
-	return ret;
-}
-
-
-int ldb_next_add_record(struct ldb_module *module, const struct ldb_message *message)
-{
-	FIND_OP(module, add_record);
-	return module->ops->add_record(module, message);
-}
-
-int ldb_next_modify_record(struct ldb_module *module, const struct ldb_message *message)
-{
-	FIND_OP(module, modify_record);
-	return module->ops->modify_record(module, message);
-}
-
-int ldb_next_delete_record(struct ldb_module *module, const struct ldb_dn *dn)
-{
-	FIND_OP(module, delete_record);
-	return module->ops->delete_record(module, dn);
-}
-
-int ldb_next_rename_record(struct ldb_module *module, const struct ldb_dn *olddn, const struct ldb_dn *newdn)
-{
-	FIND_OP(module, rename_record);
-	return module->ops->rename_record(module, olddn, newdn);
+	FIND_OP(module, request);
+	return module->ops->request(module, request);
 }
 
 int ldb_next_start_trans(struct ldb_module *module)
-- 
cgit 


From 400f03b9eaeaaf067d4362d9720f114c02752ec8 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 29 Nov 2005 08:51:36 +0000
Subject: r11953: enabled the rootdse module in the ldb modules code (This used
 to be commit 7d8b11174c97a3797673254c351c94436aa716b7)

---
 source4/lib/ldb/common/ldb_modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 91338c2e10..7f8844137c 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -135,6 +135,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		{ "samldb", samldb_module_init },
 		{ "samba3sam", ldb_samba3sam_module_init },
 		{ "proxy", proxy_module_init },
+		{ "rootdse", rootdse_module_init },
 #endif
 		{ NULL, NULL }
 	};
-- 
cgit 


From a50b42dcb5d50ef17007f727b6b3c60d4b7224a3 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 28 Dec 2005 22:43:12 +0000
Subject: r12553: Steal the error string onto this context, so that the caller
 doesn't have to think about exactly what the right context to hang it of is.

Andrew Bartlett
(This used to be commit b1c8adcfe16c72252b0312e65676edcdbe472f09)
---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 7f8844137c..4c483b7afb 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -260,6 +260,6 @@ void ldb_set_errstring(struct ldb_module *module, char *err_string)
 		talloc_free(module->ldb->err_string);
 	}
 
-	module->ldb->err_string = err_string;
+	module->ldb->err_string = talloc_steal(module->ldb, err_string);
 }
 
-- 
cgit 


From c82c9fe7bb47aa95d112159e46e79f52afe6f58d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 30 Dec 2005 08:40:16 +0000
Subject: r12599: This new LDB module (and associated changes) allows Samba4 to
 operate using pre-calculated passwords for all kerberos key types.
 (Previously we could only use these for the NT# type).

The module handles all of the hash/string2key tasks for all parts of
Samba, which was previously in the rpc_server/samr/samr_password.c
code.  We also update the msDS-KeyVersionNumber, and the password
history.  This new module can be called at provision time, which
ensures we start with a database that is consistent in this respect.

By ensuring that the krb5key attribute is the only one we need to
retrieve, this also simplifies the run-time KDC logic.  (Each value of
the multi-valued attribute is encoded as a 'Key' in ASN.1, using the
definition from Heimdal's HDB.  This simplfies the KDC code.).

It is hoped that this will speed up the KDC enough that it can again
operate under valgrind.
(This used to be commit e9022743210b59f19f370d772e532e0f08bfebd9)
---
 source4/lib/ldb/common/ldb_modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 4c483b7afb..8076dbfdf9 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -136,6 +136,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		{ "samba3sam", ldb_samba3sam_module_init },
 		{ "proxy", proxy_module_init },
 		{ "rootdse", rootdse_module_init },
+		{ "password_hash", password_hash_module_init },
 #endif
 		{ NULL, NULL }
 	};
-- 
cgit 


From 4ff20fcd31bef1df561e6ae513581202b259c1f0 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 30 Dec 2005 08:50:47 +0000
Subject: r12600: Add a new module to sort the objectclass attribute on store. 
 The module is perhaps not the most efficient, but I think it is reasonable.

This should restore operation of MMC against Samba4 (broken by the
templating fixes).

Andrew Bartlett
(This used to be commit 41948c4bdbfca1160a01a92994324f9e22422afe)
---
 source4/lib/ldb/common/ldb_modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 8076dbfdf9..5c2e36d431 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -130,6 +130,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		{ "schema", schema_module_init },
 		{ "operational", operational_module_init },
 		{ "rdn_name", rdn_name_module_init },
+		{ "objectclass", objectclass_module_init },
 #ifdef _SAMBA_BUILD_
 		{ "objectguid", objectguid_module_init },
 		{ "samldb", samldb_module_init },
-- 
cgit 


From c908d0b2aa111659e57a73efb8c33c413965c846 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Fri, 6 Jan 2006 04:01:23 +0000
Subject: r12733: Merge ldap/ldb controls into main tree There's still lot of
 work to do but the patch is stable enough to be pushed into the main samba4
 tree.

Simo.
(This used to be commit 77125feaff252cab44d26593093a9c211c846ce8)
---
 source4/lib/ldb/common/ldb_modules.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 5c2e36d431..26a397dccc 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -131,12 +131,15 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		{ "operational", operational_module_init },
 		{ "rdn_name", rdn_name_module_init },
 		{ "objectclass", objectclass_module_init },
+		{ "paged_results", paged_results_module_init },
+		{ "server_sort", server_sort_module_init },
 #ifdef _SAMBA_BUILD_
 		{ "objectguid", objectguid_module_init },
 		{ "samldb", samldb_module_init },
 		{ "samba3sam", ldb_samba3sam_module_init },
 		{ "proxy", proxy_module_init },
 		{ "rootdse", rootdse_module_init },
+		{ "extended_dn", extended_dn_module_init },
 		{ "password_hash", password_hash_module_init },
 #endif
 		{ NULL, NULL }
@@ -198,7 +201,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		int m;
 		for (m=0;well_known_modules[m].name;m++) {
 			if (strcmp(modules[i], well_known_modules[m].name) == 0) {
-				current = well_known_modules[m].init(ldb, options);
+				current = well_known_modules[m].init(ldb, LDB_MODULES_INIT_STAGE_1, options);
 				if (current == NULL) {
 					ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
 					return -1;
@@ -213,6 +216,17 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		}
 	}
 
+	/* second stage init */
+	for (i = 0; modules[i] != NULL; i++) {
+		int m;
+		for (m = 0; well_known_modules[m].name; m++) {
+			if (strcmp(modules[i], well_known_modules[m].name) == 0) {
+				well_known_modules[m].init(ldb, LDB_MODULES_INIT_STAGE_2, options);
+				break;
+			}
+		}
+	}
+
 	talloc_free(modules);
 	return 0; 
 }
-- 
cgit 


From dbef4d76de92c3388f4e1819a76d6febf90be290 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Fri, 6 Jan 2006 16:12:45 +0000
Subject: r12743: Remove the ugly way we had to make a second stage init and
 introduce a second_stage_init private function for modules that need a second
 stage init.

Simo.
(This used to be commit 5e8b365fa2d93801a5de1d9ea76ce9d5546bd248)
---
 source4/lib/ldb/common/ldb_modules.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 26a397dccc..715112a628 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -201,7 +201,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		int m;
 		for (m=0;well_known_modules[m].name;m++) {
 			if (strcmp(modules[i], well_known_modules[m].name) == 0) {
-				current = well_known_modules[m].init(ldb, LDB_MODULES_INIT_STAGE_1, options);
+				current = well_known_modules[m].init(ldb, options);
 				if (current == NULL) {
 					ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
 					return -1;
@@ -217,14 +217,9 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 	}
 
 	/* second stage init */
-	for (i = 0; modules[i] != NULL; i++) {
-		int m;
-		for (m = 0; well_known_modules[m].name; m++) {
-			if (strcmp(modules[i], well_known_modules[m].name) == 0) {
-				well_known_modules[m].init(ldb, LDB_MODULES_INIT_STAGE_2, options);
-				break;
-			}
-		}
+	if (ldb_second_stage_init(ldb) != LDB_SUCCESS) {
+		ldb_debug(ldb, LDB_DEBUG_ERROR, "ERROR: Second stage init failed!\n");
+		return -1;
 	}
 
 	talloc_free(modules);
@@ -239,7 +234,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 #define FIND_OP(module, op) do { \
 	module = module->next; \
 	while (module && module->ops->op == NULL) module = module->next; \
-	if (module == NULL) return -1; \
+	if (module == NULL) return LDB_ERR_OTHER; \
 } while (0)
 
 
@@ -252,6 +247,12 @@ int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
 	return module->ops->request(module, request);
 }
 
+int ldb_next_second_stage_init(struct ldb_module *module)
+{
+	FIND_OP(module, second_stage_init);
+	return module->ops->second_stage_init(module);
+}
+
 int ldb_next_start_trans(struct ldb_module *module)
 {
 	FIND_OP(module, start_transaction);
-- 
cgit 


From a8eec313549905724a8186a1a4c14480658e2967 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 6 Jan 2006 21:04:32 +0000
Subject: r12746: An initial version of the kludge_acls module.

This should be replaced with real ACLs, which tridge is working on.
In the meantime, the rules are very simple:

- SYSTEM and Administrators can read all.

- Users and anonymous cannot read passwords, can read everything else

- list of 'password' attributes is hard-coded

Most of the difficult work in this was fighting with the C/js
interface to add a system_session() all, as it still doesn't get on
with me :-)

Andrew Bartlett
(This used to be commit be9d0cae8989429ef47a713d8f0a82f12966fc78)
---
 source4/lib/ldb/common/ldb_modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 715112a628..f83f0b06ef 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -141,6 +141,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		{ "rootdse", rootdse_module_init },
 		{ "extended_dn", extended_dn_module_init },
 		{ "password_hash", password_hash_module_init },
+		{ "kludge_acl", kludge_acl_module_init },
 #endif
 		{ NULL, NULL }
 	};
-- 
cgit 


From 4d1c5a023cf6680474bd8d8be73f576d155cfe81 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 10 Jan 2006 16:48:32 +0000
Subject: r12829: fix ldb headers, to not include '<...>' files in .c files

this helps in getting symbol -fvisibility=hidden (GCC 4 feature) working later.

metze
(This used to be commit 380938e97f31c7860aed1e73cc0110c6e17b472e)
---
 source4/lib/ldb/common/ldb_modules.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index f83f0b06ef..804bd654f3 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -34,17 +34,7 @@
  */
 
 #include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_errors.h"
-#include "ldb/include/ldb_private.h"
-#include "dlinklist.h"
-#include <sys/types.h> 
-#include <sys/stat.h> 
-#include <unistd.h> 
-
-#ifdef HAVE_DLOPEN_DISABLED
-#include <dlfcn.h>
-#endif
+#include "ldb/include/includes.h"
 
 #define LDB_MODULE_PREFIX	"modules:"
 #define LDB_MODULE_PREFIX_LEN	8
-- 
cgit 


From b424fdd2533068ed06aef648f126912fe3d8254f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 10 Jan 2006 16:51:46 +0000
Subject: r12830: this can be const

metze
(This used to be commit 1876e245c49d521e89674dc1662a61e8f4cdc9b5)
---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 804bd654f3..e336a58901 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -113,7 +113,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 {
 	char **modules = NULL;
 	int i;
-	struct {
+	const struct {
 		const char *name;
 		ldb_module_init_t init;
 	} well_known_modules[] = {
-- 
cgit 


From cd9752d61f49a07a1e943b524c56e0bb75cdeb61 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 13 Jan 2006 16:58:04 +0000
Subject: r12909: add an ldb module for the wins.ldb,

it currently doesn't do much, but it's later
prevent adding corrupted records via ldbedit,
and will take care of the versionID counter

metze
(This used to be commit a6f279bc43c74cf4dc116cb6ba99f1aed13a4de9)
---
 source4/lib/ldb/common/ldb_modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index e336a58901..f49ccf5413 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -132,6 +132,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		{ "extended_dn", extended_dn_module_init },
 		{ "password_hash", password_hash_module_init },
 		{ "kludge_acl", kludge_acl_module_init },
+		{ "wins_ldb", wins_ldb_module_init },
 #endif
 		{ NULL, NULL }
 	};
-- 
cgit 


From 3725b1817f1e26370015d955622f0705e9121714 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 15 Jan 2006 06:12:29 +0000
Subject: r12941: Add Attribute Scoped Search control

want to see what it does ?

do aq make test and try:
./bin/ldbsearch -H st/private/sam.ldb --controls=asq:1:member -s base -b 'CN=Administrators,CN=Builtin,DC=samba,DC=example,DC=com' 'objectclass=*'

have fun.
simo.
(This used to be commit 900f4fd3435aacc3351f30afb77d3488d2cb4804)
---
 source4/lib/ldb/common/ldb_modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index f49ccf5413..ddbdddedcc 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -123,6 +123,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		{ "objectclass", objectclass_module_init },
 		{ "paged_results", paged_results_module_init },
 		{ "server_sort", server_sort_module_init },
+		{ "asq", asq_module_init },
 #ifdef _SAMBA_BUILD_
 		{ "objectguid", objectguid_module_init },
 		{ "samldb", samldb_module_init },
-- 
cgit 


From 00fe70e5b917769418f68eaa255d3a06a9a08ce7 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 22 Feb 2006 01:31:35 +0000
Subject: r13609: Get in the initial work on making ldb async Currently only
 ldb_ildap is async, the plan is to first make all backend support the async
 calls, and then remove the sync functions from backends and keep the only in
 the API.

Modules will need to be transformed along the way.

Simo
(This used to be commit 1e2c13b2d52de7c534493dd79a2c0596a3e8c1f5)
---
 source4/lib/ldb/common/ldb_modules.c | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index ddbdddedcc..922506ea4d 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -263,13 +263,3 @@ int ldb_next_del_trans(struct ldb_module *module)
 	FIND_OP(module, del_transaction);
 	return module->ops->del_transaction(module);
 }
-
-void ldb_set_errstring(struct ldb_module *module, char *err_string)
-{
-	if (module->ldb->err_string) {
-		talloc_free(module->ldb->err_string);
-	}
-
-	module->ldb->err_string = talloc_steal(module->ldb, err_string);
-}
-
-- 
cgit 


From 26af14c39b88b0e7eb53657b89be65d865804688 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 2 Mar 2006 16:32:53 +0000
Subject: r13786: [merge] Add registration functions for LDB modules

Applications that use LDB modules will now have to run ldb_global_init()
before they can use LDB.

The next step will be adding support for loading LDB modules from .so
files. This will also allow us to use one LDB without difference between the
standalone and the Samba-specific build
(This used to be commit 52a235650514039bf8ffee99a784bbc1b6ae6b92)
---
 source4/lib/ldb/common/ldb_modules.c | 153 ++++++++++++++++++++++++-----------
 1 file changed, 107 insertions(+), 46 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 922506ea4d..f1b4783fca 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -67,7 +67,7 @@ static char *talloc_strdup_no_spaces(struct ldb_context *ldb, const char *string
 
 /* modules are called in inverse order on the stack.
    Lets place them as an admin would think the right order is.
-   Modules order is imprtant */
+   Modules order is important */
 static char **ldb_modules_list_from_string(struct ldb_context *ldb, const char *string)
 {
 	char **modules = NULL;
@@ -109,35 +109,79 @@ static char **ldb_modules_list_from_string(struct ldb_context *ldb, const char *
 	return modules;
 }
 
+static struct ops_list_entry {
+	const struct ldb_module_ops *ops;
+	struct ops_list_entry *next;	
+} *registered_modules = NULL;
+
+static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
+{
+	struct ops_list_entry *e;
+ 
+	for (e = registered_modules; e; e = e->next) {
+ 		if (strcmp(e->ops->name, name) == 0) 
+			return e->ops;
+	}
+
+	return NULL;
+}
+
+	
+#ifndef STATIC_LIBLDB_MODULES
+#define STATIC_LIBLDB_MODULES \
+	{	\
+		ldb_schema_init,	\
+		ldb_operational_init,	\
+		ldb_rdn_name_init,	\
+		ldb_objectclass_init,	\
+		ldb_paged_results_init,	\
+		ldb_sort_init,		\
+		NULL			\
+	}
+#endif
+
+int ldb_global_init(void)
+{
+	static int (*static_init_fns[])(void) = STATIC_LIBLDB_MODULES;
+
+	static int initialized = 0;
+	int ret = 0, i;
+
+	if (initialized) 
+		return 0;
+
+	initialized = 1;
+	
+	for (i = 0; static_init_fns[i]; i++) {
+		if (static_init_fns[i]() == -1)
+			ret = -1;
+	}
+
+	return ret;
+}
+
+int ldb_register_module(const struct ldb_module_ops *ops)
+{
+	struct ops_list_entry *entry = talloc(talloc_autofree_context(), struct ops_list_entry);
+
+	if (ldb_find_module_ops(ops->name) != NULL)
+		return -1;
+
+	if (entry == NULL)
+		return -1;
+
+	entry->ops = ops;
+	entry->next = registered_modules;
+	registered_modules = entry;
+
+	return 0;
+}
+
 int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 {
 	char **modules = NULL;
+	struct ldb_module *module;
 	int i;
-	const struct {
-		const char *name;
-		ldb_module_init_t init;
-	} well_known_modules[] = {
-		{ "schema", schema_module_init },
-		{ "operational", operational_module_init },
-		{ "rdn_name", rdn_name_module_init },
-		{ "objectclass", objectclass_module_init },
-		{ "paged_results", paged_results_module_init },
-		{ "server_sort", server_sort_module_init },
-		{ "asq", asq_module_init },
-#ifdef _SAMBA_BUILD_
-		{ "objectguid", objectguid_module_init },
-		{ "samldb", samldb_module_init },
-		{ "samba3sam", ldb_samba3sam_module_init },
-		{ "proxy", proxy_module_init },
-		{ "rootdse", rootdse_module_init },
-		{ "extended_dn", extended_dn_module_init },
-		{ "password_hash", password_hash_module_init },
-		{ "kludge_acl", kludge_acl_module_init },
-		{ "wins_ldb", wins_ldb_module_init },
-#endif
-		{ NULL, NULL }
-	};
-
 	/* find out which modules we are requested to activate */
 
 	/* check if we have a custom module list passd as ldb option */
@@ -149,7 +193,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		}
 	}
 
-	/* if not overloaded by options and the backend is not ldap try to load the modules list form ldb */
+	/* if not overloaded by options and the backend is not ldap try to load the modules list from ldb */
 	if ((modules == NULL) && (strcmp("ldap", ldb->modules->ops->name) != 0)) { 
 		int ret;
 		const char * const attrs[] = { "@LIST" , NULL};
@@ -191,27 +235,34 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 
 	for (i = 0; modules[i] != NULL; i++) {
 		struct ldb_module *current;
-		int m;
-		for (m=0;well_known_modules[m].name;m++) {
-			if (strcmp(modules[i], well_known_modules[m].name) == 0) {
-				current = well_known_modules[m].init(ldb, options);
-				if (current == NULL) {
-					ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]);
-					return -1;
-				}
-				DLIST_ADD(ldb->modules, current);
-				break;
-			}
-		}
-		if (well_known_modules[m].name == NULL) {
+		const struct ldb_module_ops *ops;
+				
+		ops = ldb_find_module_ops(modules[i]);
+		if (ops == NULL) {
 			ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", 
 				  modules[i]);
+			continue;
 		}
+
+		current = talloc_zero(ldb, struct ldb_module);
+		if (current == NULL) {
+			return -1;
+		}
+
+		current->ldb = ldb;
+		current->ops = ops;
+		
+		DLIST_ADD(ldb->modules, current);
 	}
 
-	/* second stage init */
-	if (ldb_second_stage_init(ldb) != LDB_SUCCESS) {
-		ldb_debug(ldb, LDB_DEBUG_ERROR, "ERROR: Second stage init failed!\n");
+	module = ldb->modules;
+
+	while (module && module->ops->init_context == NULL) 
+		module = module->next;
+
+	if (module && module->ops->init_context &&
+		module->ops->init_context(module) != LDB_SUCCESS) {
+		ldb_debug(ldb, LDB_DEBUG_FATAL, "module initialization failed\n");
 		return -1;
 	}
 
@@ -240,10 +291,20 @@ int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
 	return module->ops->request(module, request);
 }
 
-int ldb_next_second_stage_init(struct ldb_module *module)
+int ldb_next_init(struct ldb_module *module)
 {
-	FIND_OP(module, second_stage_init);
-	return module->ops->second_stage_init(module);
+	/* init is different in that it is not an error if modules
+	 * do not require initialization */
+
+	module = module->next;
+
+	while (module && module->ops->init_context == NULL) 
+		module = module->next;
+
+	if (module == NULL) 
+		return LDB_SUCCESS;
+
+	return module->ops->init_context(module);
 }
 
 int ldb_next_start_trans(struct ldb_module *module)
-- 
cgit 


From 509814bd037a3c73fea4ab92b531c25964f34dfa Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Fri, 3 Mar 2006 20:01:19 +0000
Subject: r13823: make async_wait part of the modules ops (This used to be
 commit b4202cf030d5f154f0f94f5f501ecd648ba5c48f)

---
 source4/lib/ldb/common/ldb_modules.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index f1b4783fca..17c5231e54 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -278,7 +278,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 #define FIND_OP(module, op) do { \
 	module = module->next; \
 	while (module && module->ops->op == NULL) module = module->next; \
-	if (module == NULL) return LDB_ERR_OTHER; \
+	if (module == NULL) return LDB_ERR_OPERATIONS_ERROR; \
 } while (0)
 
 
@@ -324,3 +324,9 @@ int ldb_next_del_trans(struct ldb_module *module)
 	FIND_OP(module, del_transaction);
 	return module->ops->del_transaction(module);
 }
+
+int ldb_next_async_wait(struct ldb_module *module, struct ldb_async_handle *handle, enum ldb_async_wait_type type)
+{
+	FIND_OP(module, async_wait);
+	return module->ops->async_wait(module, handle, type);
+}
-- 
cgit 


From 5d0aa16dfcf3047a52d3dd7e12ffb704a9725e83 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 5 Mar 2006 16:05:26 +0000
Subject: r13839: Use registration mechanism for backends as well (in the same
 sense my previous patch added it for modules). This is the next step towards
 LDB backends and modules as run-time loadable .so files. (This used to be
 commit fb2f70de4f6c4a9b13ad590cb4d3a9c858cede49)

---
 source4/lib/ldb/common/ldb_modules.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 17c5231e54..53394e7047 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -126,10 +126,24 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 	return NULL;
 }
 
-	
+#ifdef HAVE_LDAP
+#define LDAP_INIT ldb_ldap_init,
+#else
+#define LDAP_INIT
+#endif
+
+#ifdef HAVE_SQLITE3
+#define SQLITE3_INIT ldb_sqlite3_init,
+#else
+#define SQLITE3_INIT
+#endif
+
 #ifndef STATIC_LIBLDB_MODULES
 #define STATIC_LIBLDB_MODULES \
 	{	\
+		LDAP_INIT \
+		SQLITE3_INIT \
+		ldb_tdb_init, 	\
 		ldb_schema_init,	\
 		ldb_operational_init,	\
 		ldb_rdn_name_init,	\
-- 
cgit 


From 9862fabead2f82ed0864c5de0dfe4f3bda4db7f5 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 6 Mar 2006 21:58:07 +0000
Subject: r13901: Backends need to be initialized even if there are no modules
 (This used to be commit 8340ab26dd61d90242283d4e6a0db10f6f6467e2)

---
 source4/lib/ldb/common/ldb_modules.c | 44 ++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 53394e7047..5dab448a56 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -242,31 +242,32 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		talloc_free(res);
 	}
 
-	if (modules == NULL) {
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "No modules specified for this database\n");
-		return 0;
-	}
-
-	for (i = 0; modules[i] != NULL; i++) {
-		struct ldb_module *current;
-		const struct ldb_module_ops *ops;
+	if (modules != NULL) {
+		for (i = 0; modules[i] != NULL; i++) {
+			struct ldb_module *current;
+			const struct ldb_module_ops *ops;
 				
-		ops = ldb_find_module_ops(modules[i]);
-		if (ops == NULL) {
-			ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", 
-				  modules[i]);
-			continue;
-		}
+			ops = ldb_find_module_ops(modules[i]);
+			if (ops == NULL) {
+				ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", 
+					  modules[i]);
+				continue;
+			}
 
-		current = talloc_zero(ldb, struct ldb_module);
-		if (current == NULL) {
-			return -1;
-		}
+			current = talloc_zero(ldb, struct ldb_module);
+			if (current == NULL) {
+				return -1;
+			}
 
-		current->ldb = ldb;
-		current->ops = ops;
+			current->ldb = ldb;
+			current->ops = ops;
 		
-		DLIST_ADD(ldb->modules, current);
+			DLIST_ADD(ldb->modules, current);
+		}
+
+		talloc_free(modules);
+	} else {
+		ldb_debug(ldb, LDB_DEBUG_TRACE, "No modules specified for this database\n");
 	}
 
 	module = ldb->modules;
@@ -280,7 +281,6 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		return -1;
 	}
 
-	talloc_free(modules);
 	return 0; 
 }
 
-- 
cgit 


From 812edc6b99f3733a8851f0b28369acc920cae398 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 7 Mar 2006 18:39:52 +0000
Subject: r13973: fix the build

metze
(This used to be commit 30af3be22b5f9e6d106954222a3bc4bb53c76665)
---
 source4/lib/ldb/common/ldb_modules.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 5dab448a56..59cf42165b 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -138,8 +138,8 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 #define SQLITE3_INIT
 #endif
 
-#ifndef STATIC_LIBLDB_MODULES
-#define STATIC_LIBLDB_MODULES \
+#ifndef STATIC_ldb_MODULES
+#define STATIC_ldb_MODULES \
 	{	\
 		LDAP_INIT \
 		SQLITE3_INIT \
@@ -156,7 +156,7 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 
 int ldb_global_init(void)
 {
-	static int (*static_init_fns[])(void) = STATIC_LIBLDB_MODULES;
+	static int (*static_init_fns[])(void) = STATIC_ldb_MODULES;
 
 	static int initialized = 0;
 	int ret = 0, i;
-- 
cgit 


From 49e6945ca838737423939272e532221323b22128 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 7 Mar 2006 21:02:11 +0000
Subject: r13990: Fix issues with function renaming. (This used to be commit
 988ea27e22e3c0f4daf118151f90db5bb243bffc)

---
 source4/lib/ldb/common/ldb_modules.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 59cf42165b..2fde859aeb 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -36,6 +36,10 @@
 #include "includes.h"
 #include "ldb/include/includes.h"
 
+#ifdef _SAMBA_BUILD_
+#include "build.h"
+#endif
+
 #define LDB_MODULE_PREFIX	"modules:"
 #define LDB_MODULE_PREFIX_LEN	8
 
-- 
cgit 


From 7b82c4beb93375f79b6c06fc86bb31873baa187b Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Tue, 7 Mar 2006 21:08:09 +0000
Subject: r13992: change the way ldb_async_wait() works.

I think I should change the name of this function
to ldb_async_process(), any opinions ?
(This used to be commit 3347322d1327cfa975ee9dccd4f2774e6e14fbcb)
---
 source4/lib/ldb/common/ldb_modules.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 2fde859aeb..0cb0041d84 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -342,9 +342,3 @@ int ldb_next_del_trans(struct ldb_module *module)
 	FIND_OP(module, del_transaction);
 	return module->ops->del_transaction(module);
 }
-
-int ldb_next_async_wait(struct ldb_module *module, struct ldb_async_handle *handle, enum ldb_async_wait_type type)
-{
-	FIND_OP(module, async_wait);
-	return module->ops->async_wait(module, handle, type);
-}
-- 
cgit 


From bb1909e15e7a9f3cd79da2ce8b8ef90f1a557376 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 20 Mar 2006 21:44:59 +0000
Subject: r14592: Add support for loading shared modules to LDB. (This used to
 be commit f10fae23f0685b2d9c6174596e1c66d799f02c52)

---
 source4/lib/ldb/common/ldb_modules.c | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 0cb0041d84..6ba5fbbc20 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -195,6 +195,39 @@ int ldb_register_module(const struct ldb_module_ops *ops)
 	return 0;
 }
 
+int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
+{
+	char *path;
+	void *handle;
+	int (*init_fn) (void);
+
+#ifdef HAVE_DLOPEN
+	path = talloc_asprintf(ldb, "%s/%s.%s", MODULESDIR, name, SHLIBEXT);
+
+	ldb_debug(ldb, LDB_DEBUG_TRACE, "trying to load %s from %s\n", name, path);
+
+	handle = dlopen(path, 0);
+	if (handle == NULL) {
+		ldb_debug(ldb, LDB_DEBUG_WARNING, "unable to load %s from %s: %s\n", name, path, dlerror());
+		return -1;
+	}
+
+	init_fn = dlsym(handle, "init_module");
+
+	if (init_fn == NULL) {
+		ldb_debug(ldb, LDB_DEBUG_ERROR, "no symbol `init_module' found in %s: %s\n", path, dlerror());
+		return -1;
+	}
+
+	talloc_free(path);
+
+	return init_fn();
+#else
+	ldb_debug(ldb, LDB_DEBUG_TRACE, "no dlopen() - not trying to load %s module\n", name);
+	return -1;
+#endif
+}
+
 int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 {
 	char **modules = NULL;
@@ -252,6 +285,12 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			const struct ldb_module_ops *ops;
 				
 			ops = ldb_find_module_ops(modules[i]);
+			if (ops == NULL) {
+				if (ldb_try_load_dso(ldb, modules[i]) == 0) {
+					ops = ldb_find_module_ops(modules[i]);
+				}
+			}
+			
 			if (ops == NULL) {
 				ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", 
 					  modules[i]);
-- 
cgit 


From 07bdbd4592ecae2325a3456fe9d9700e6c256b64 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 21 Mar 2006 08:32:50 +0000
Subject: r14606: Fix paths in developer mode. This allows 'make quicktest' to
 work when building with --enable-dso (This used to be commit
 614f062748d95a455d1a99a7444fdc0fe152f4e4)

---
 source4/lib/ldb/common/ldb_modules.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 6ba5fbbc20..bc27d1ed1b 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -38,6 +38,7 @@
 
 #ifdef _SAMBA_BUILD_
 #include "build.h"
+#include "dynconfig.h"
 #endif
 
 #define LDB_MODULE_PREFIX	"modules:"
@@ -202,7 +203,11 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
 	int (*init_fn) (void);
 
 #ifdef HAVE_DLOPEN
+#ifdef _SAMBA_BUILD_
+	path = talloc_asprintf(ldb, "%s/ldb/%s.%s", dyn_MODULESDIR, name, dyn_SHLIBEXT);
+#else
 	path = talloc_asprintf(ldb, "%s/%s.%s", MODULESDIR, name, SHLIBEXT);
+#endif
 
 	ldb_debug(ldb, LDB_DEBUG_TRACE, "trying to load %s from %s\n", name, path);
 
-- 
cgit 


From 3a4d7eb2c08a06fac89c34d132f1c32751ce7ad5 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 29 May 2006 01:30:02 +0000
Subject: r15927: Optimize ldb module traverse while keeping the API intact. I
 was sick of jumping inot each module for each request, even the ones not
 handle by that module. (This used to be commit
 7d65105e885a28584e8555453b90232c43a92bf7)

---
 source4/lib/ldb/common/ldb_modules.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index bc27d1ed1b..4ce404d096 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -347,10 +347,29 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 /*
    helper functions to call the next module in chain
 */
+
 int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
 {
-	FIND_OP(module, request);
-	return module->ops->request(module, request);
+	switch (request->operation) {
+	case LDB_ASYNC_SEARCH:
+		FIND_OP(module, search);
+		return module->ops->search(module, request);
+	case LDB_ASYNC_ADD:
+		FIND_OP(module, add);
+		return module->ops->add(module, request);
+	case LDB_ASYNC_MODIFY:
+		FIND_OP(module, modify);
+		return module->ops->modify(module, request);
+	case LDB_ASYNC_DELETE:
+		FIND_OP(module, del);
+		return module->ops->del(module, request);
+	case LDB_ASYNC_RENAME:
+		FIND_OP(module, rename);
+		return module->ops->rename(module, request);
+	default:
+		FIND_OP(module, request);
+		return module->ops->request(module, request);
+	}
 }
 
 int ldb_next_init(struct ldb_module *module)
-- 
cgit 


From 2d19dca9c80a5e3990296dde67163fce36ac883d Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Tue, 30 May 2006 00:33:52 +0000
Subject: r15944: rename LDB_ASYNC_ADD -> LDB_ADD, LDB_ASYNC_MODIFY ->
 LDB_MODIFY, etc... (This used to be commit
 55d97ef88f377ef1dbf7b1774a15cf9035e2f320)

---
 source4/lib/ldb/common/ldb_modules.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 4ce404d096..6f36bdc5e9 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -351,19 +351,19 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
 {
 	switch (request->operation) {
-	case LDB_ASYNC_SEARCH:
+	case LDB_SEARCH:
 		FIND_OP(module, search);
 		return module->ops->search(module, request);
-	case LDB_ASYNC_ADD:
+	case LDB_ADD:
 		FIND_OP(module, add);
 		return module->ops->add(module, request);
-	case LDB_ASYNC_MODIFY:
+	case LDB_MODIFY:
 		FIND_OP(module, modify);
 		return module->ops->modify(module, request);
-	case LDB_ASYNC_DELETE:
+	case LDB_DELETE:
 		FIND_OP(module, del);
 		return module->ops->del(module, request);
-	case LDB_ASYNC_RENAME:
+	case LDB_RENAME:
 		FIND_OP(module, rename);
 		return module->ops->rename(module, request);
 	default:
-- 
cgit 


From 247af0d569594512a24e83156e257b8d4d356883 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 7 Jun 2006 21:03:38 +0000
Subject: r16083: Make it possible to initialise a backend module, without it
 setting up the whole ldb structure.

Because the sequence number was a fn pointer on the main ldb context,
turn it into a full request (currently sync).

Andrew Bartlett
(This used to be commit fbe7d0ca9031e292b2d2fae263233c973982980a)
---
 source4/lib/ldb/common/ldb_modules.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 6f36bdc5e9..d09579510e 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -366,6 +366,9 @@ int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
 	case LDB_RENAME:
 		FIND_OP(module, rename);
 		return module->ops->rename(module, request);
+	case LDB_SEQUENCE_NUMBER:
+		FIND_OP(module, sequence_number);
+		return module->ops->sequence_number(module, request);
 	default:
 		FIND_OP(module, request);
 		return module->ops->request(module, request);
-- 
cgit 


From 977e44c556c76ee6df9359124807e003e4dc3257 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 10 Jul 2006 08:31:47 +0000
Subject: r16908: Set an error string if we can't find a backend for an
 operation.

Andrew Bartlett
(This used to be commit 6a8c9af9bae8c482dfdb07114ae8313b7e35d9e9)
---
 source4/lib/ldb/common/ldb_modules.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index d09579510e..558a6f4d83 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -338,9 +338,13 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
   when ldb is extended
 */
 #define FIND_OP(module, op) do { \
+	struct ldb_context *ldb = module->ldb; \
 	module = module->next; \
 	while (module && module->ops->op == NULL) module = module->next; \
-	if (module == NULL) return LDB_ERR_OPERATIONS_ERROR; \
+	if (module == NULL) { \
+		ldb_set_errstring(ldb, talloc_strdup(ldb, "Unable to find backend operation for " #op )); \
+		return LDB_ERR_OPERATIONS_ERROR;	\
+	}						\
 } while (0)
 
 
-- 
cgit 


From bf5e85ba2502ccc8bd94eb216a82d1497ca7ff19 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 4 Aug 2006 10:27:14 +0000
Subject: r17397: Add const, and use a more local memory context.

Andrew Bartlett
(This used to be commit 59fc8031ecf3ba5aa2eff9ec5fa7df76d0c990c6)
---
 source4/lib/ldb/common/ldb_modules.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 558a6f4d83..7d1a91126e 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -73,19 +73,20 @@ static char *talloc_strdup_no_spaces(struct ldb_context *ldb, const char *string
 /* modules are called in inverse order on the stack.
    Lets place them as an admin would think the right order is.
    Modules order is important */
-static char **ldb_modules_list_from_string(struct ldb_context *ldb, const char *string)
+static const char **ldb_modules_list_from_string(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, const char *string)
 {
 	char **modules = NULL;
+	const char **m;
 	char *modstr, *p;
 	int i;
 
 	/* spaces not admitted */
-	modstr = talloc_strdup_no_spaces(ldb, string);
+	modstr = talloc_strdup_no_spaces(mem_ctx, string);
 	if ( ! modstr) {
 		return NULL;
 	}
 
-	modules = talloc_realloc(ldb, modules, char *, 2);
+	modules = talloc_realloc(mem_ctx, modules, char *, 2);
 	if ( ! modules ) {
 		ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in ldb_modules_list_from_string()\n");
 		talloc_free(modstr);
@@ -100,7 +101,7 @@ static char **ldb_modules_list_from_string(struct ldb_context *ldb, const char *
 		modules[i] = p;
 
 		i++;
-		modules = talloc_realloc(ldb, modules, char *, i + 2);
+		modules = talloc_realloc(mem_ctx, modules, char *, i + 2);
 		if ( ! modules ) {
 			ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in ldb_modules_list_from_string()\n");
 			return NULL;
@@ -111,7 +112,9 @@ static char **ldb_modules_list_from_string(struct ldb_context *ldb, const char *
 
 	modules[i + 1] = NULL;
 
-	return modules;
+	m = (const char **)modules;
+
+	return m;
 }
 
 static struct ops_list_entry {
@@ -235,16 +238,21 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
 
 int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 {
-	char **modules = NULL;
+	const char **modules = NULL;
 	struct ldb_module *module;
 	int i;
+	TALLOC_CTX *mem_ctx = talloc_new(ldb);
+	if (!mem_ctx) {
+		return LDB_ERR_OPERATIONS_ERROR;
+	}
+
 	/* find out which modules we are requested to activate */
 
 	/* check if we have a custom module list passd as ldb option */
 	if (options) {
 		for (i = 0; options[i] != NULL; i++) {
 			if (strncmp(options[i], LDB_MODULE_PREFIX, LDB_MODULE_PREFIX_LEN) == 0) {
-				modules = ldb_modules_list_from_string(ldb, &options[i][LDB_MODULE_PREFIX_LEN]);
+				modules = ldb_modules_list_from_string(ldb, mem_ctx, &options[i][LDB_MODULE_PREFIX_LEN]);
 			}
 		}
 	}
@@ -253,11 +261,12 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 	if ((modules == NULL) && (strcmp("ldap", ldb->modules->ops->name) != 0)) { 
 		int ret;
 		const char * const attrs[] = { "@LIST" , NULL};
-		struct ldb_result *res = NULL;
+		struct ldb_result *res;
 		struct ldb_dn *mods;
 
-		mods = ldb_dn_explode(ldb, "@MODULES");
+		mods = ldb_dn_explode(mem_ctx, "@MODULES");
 		if (mods == NULL) {
+			talloc_free(mem_ctx);
 			return -1;
 		}
 
@@ -268,20 +277,21 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		} else {
 			if (ret != LDB_SUCCESS) {
 				ldb_debug(ldb, LDB_DEBUG_FATAL, "ldb error (%s) occurred searching for modules, bailing out\n", ldb_errstring(ldb));
+				talloc_free(mem_ctx);
 				return -1;
 			}
 			if (res->count > 1) {
 				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%d), bailing out\n", res->count);
 				talloc_free(res);
+				talloc_free(mem_ctx);
 				return -1;
 			}
 
-			modules = ldb_modules_list_from_string(ldb, 
+			modules = ldb_modules_list_from_string(ldb, mem_ctx,
 							       (const char *)res->msgs[0]->elements[0].values[0].data);
 
+			talloc_free(res);
 		}
-
-		talloc_free(res);
 	}
 
 	if (modules != NULL) {
-- 
cgit 


From 9481764b1985219e4cedfaab2620e15a074b2dd1 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Fri, 4 Aug 2006 12:05:46 +0000
Subject: r17398: avoid a memleak when we are returned 0 results and make a
 more creative use of memory contexts (This used to be commit
 fc97b5dc8ce65232a7a98ffb59def44a931b1565)

---
 source4/lib/ldb/common/ldb_modules.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 7d1a91126e..b425796dfc 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -261,17 +261,17 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 	if ((modules == NULL) && (strcmp("ldap", ldb->modules->ops->name) != 0)) { 
 		int ret;
 		const char * const attrs[] = { "@LIST" , NULL};
-		struct ldb_result *res;
-		struct ldb_dn *mods;
+		struct ldb_result *res = NULL;
+		struct ldb_dn *mods_dn;
 
-		mods = ldb_dn_explode(mem_ctx, "@MODULES");
-		if (mods == NULL) {
+		mods_dn = ldb_dn_explode(mem_ctx, "@MODULES");
+		if (mods_dn == NULL) {
 			talloc_free(mem_ctx);
 			return -1;
 		}
 
-		ret = ldb_search(ldb, mods, LDB_SCOPE_BASE, "", attrs, &res);
-		talloc_free(mods);
+		ret = ldb_search(ldb, mods_dn, LDB_SCOPE_BASE, "", attrs, &res);
+		if (res) talloc_steal(mods_dn, res);
 		if (ret == LDB_SUCCESS && (res->count == 0 || res->msgs[0]->num_elements == 0)) {
 			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
 		} else {
@@ -282,7 +282,6 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			}
 			if (res->count > 1) {
 				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%d), bailing out\n", res->count);
-				talloc_free(res);
 				talloc_free(mem_ctx);
 				return -1;
 			}
@@ -290,8 +289,9 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			modules = ldb_modules_list_from_string(ldb, mem_ctx,
 							       (const char *)res->msgs[0]->elements[0].values[0].data);
 
-			talloc_free(res);
 		}
+
+		talloc_free(mods_dn);
 	}
 
 	if (modules != NULL) {
-- 
cgit 


From 11685acd1d79591ed2b9d2656bee5a51442ced0f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 10 Aug 2006 00:52:56 +0000
Subject: r17473: Split loading a list of modules and initialising them into a
 seperate function.

Andrew Bartlett
(This used to be commit bed17cc579d82f04e44ce3c3d1e74d999c2ab867)
---
 source4/lib/ldb/common/ldb_modules.c | 100 ++++++++++++++++++++---------------
 1 file changed, 58 insertions(+), 42 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index b425796dfc..9eb0a950a4 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -236,11 +236,63 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
 #endif
 }
 
+static int ldb_load_modules_list(struct ldb_context *ldb, const char **module_list, struct ldb_module *backend, struct ldb_module **out)
+{
+	struct ldb_module *module;
+	int i, ret;
+	
+	module = backend;
+
+	for (i = 0; module_list[i] != NULL; i++) {
+		struct ldb_module *current;
+		const struct ldb_module_ops *ops;
+		
+		ops = ldb_find_module_ops(module_list[i]);
+		if (ops == NULL) {
+			if (ldb_try_load_dso(ldb, module_list[i]) == 0) {
+				ops = ldb_find_module_ops(module_list[i]);
+			}
+		}
+		
+		if (ops == NULL) {
+			ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", 
+				  module_list[i]);
+			continue;
+		}
+		
+		current = talloc_zero(ldb, struct ldb_module);
+		if (current == NULL) {
+			return LDB_ERR_OPERATIONS_ERROR;
+		}
+		
+		current->ldb = ldb;
+		current->ops = ops;
+		
+		DLIST_ADD(module, current);
+	}
+	*out = module;
+	return LDB_SUCCESS;
+}
+
+static int ldb_init_module_chain(struct ldb_context *ldb, struct ldb_module *module) 
+{
+	while (module && module->ops->init_context == NULL) 
+		module = module->next;
+
+	if (module && module->ops->init_context &&
+		module->ops->init_context(module) != LDB_SUCCESS) {
+		ldb_debug(ldb, LDB_DEBUG_FATAL, "module initialization failed\n");
+		return LDB_ERR_OPERATIONS_ERROR;
+	}
+
+	return LDB_SUCCESS;
+}
+
 int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 {
 	const char **modules = NULL;
-	struct ldb_module *module;
 	int i;
+	int ret;
 	TALLOC_CTX *mem_ctx = talloc_new(ldb);
 	if (!mem_ctx) {
 		return LDB_ERR_OPERATIONS_ERROR;
@@ -259,7 +311,6 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 
 	/* if not overloaded by options and the backend is not ldap try to load the modules list from ldb */
 	if ((modules == NULL) && (strcmp("ldap", ldb->modules->ops->name) != 0)) { 
-		int ret;
 		const char * const attrs[] = { "@LIST" , NULL};
 		struct ldb_result *res = NULL;
 		struct ldb_dn *mods_dn;
@@ -295,51 +346,16 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 	}
 
 	if (modules != NULL) {
-		for (i = 0; modules[i] != NULL; i++) {
-			struct ldb_module *current;
-			const struct ldb_module_ops *ops;
-				
-			ops = ldb_find_module_ops(modules[i]);
-			if (ops == NULL) {
-				if (ldb_try_load_dso(ldb, modules[i]) == 0) {
-					ops = ldb_find_module_ops(modules[i]);
-				}
-			}
-			
-			if (ops == NULL) {
-				ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", 
-					  modules[i]);
-				continue;
-			}
-
-			current = talloc_zero(ldb, struct ldb_module);
-			if (current == NULL) {
-				return -1;
-			}
-
-			current->ldb = ldb;
-			current->ops = ops;
-		
-			DLIST_ADD(ldb->modules, current);
-		}
-
+		ret = ldb_load_modules_list(ldb, modules, ldb->modules, &ldb->modules);
 		talloc_free(modules);
+		if (ret != LDB_SUCCESS) {
+			return ret;
+		}
 	} else {
 		ldb_debug(ldb, LDB_DEBUG_TRACE, "No modules specified for this database\n");
 	}
 
-	module = ldb->modules;
-
-	while (module && module->ops->init_context == NULL) 
-		module = module->next;
-
-	if (module && module->ops->init_context &&
-		module->ops->init_context(module) != LDB_SUCCESS) {
-		ldb_debug(ldb, LDB_DEBUG_FATAL, "module initialization failed\n");
-		return -1;
-	}
-
-	return 0; 
+	return ldb_init_module_chain(ldb, ldb->modules);
 }
 
 /*
-- 
cgit 


From ecfdd5fc6cd704eaf496f4d31c18b6db97589fb3 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 10 Aug 2006 01:51:27 +0000
Subject: r17474: Allow the partitions module to load modules for specific
 backends.

Andrew Bartlett
(This used to be commit c016db2187120991e8ad779b9df35480d7c19400)
---
 source4/lib/ldb/common/ldb_modules.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 9eb0a950a4..d38c873c3b 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -73,7 +73,7 @@ static char *talloc_strdup_no_spaces(struct ldb_context *ldb, const char *string
 /* modules are called in inverse order on the stack.
    Lets place them as an admin would think the right order is.
    Modules order is important */
-static const char **ldb_modules_list_from_string(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, const char *string)
+const char **ldb_modules_list_from_string(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, const char *string)
 {
 	char **modules = NULL;
 	const char **m;
@@ -95,6 +95,7 @@ static const char **ldb_modules_list_from_string(struct ldb_context *ldb, TALLOC
 	talloc_steal(modules, modstr);
 
 	i = 0;
+	/* The str*r*chr walks backwards:  This is how we get the inverse order mentioned above */
 	while ((p = strrchr(modstr, ',')) != NULL) {
 		*p = '\0';
 		p++;
@@ -236,10 +237,10 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
 #endif
 }
 
-static int ldb_load_modules_list(struct ldb_context *ldb, const char **module_list, struct ldb_module *backend, struct ldb_module **out)
+int ldb_load_modules_list(struct ldb_context *ldb, const char **module_list, struct ldb_module *backend, struct ldb_module **out)
 {
 	struct ldb_module *module;
-	int i, ret;
+	int i;
 	
 	module = backend;
 
@@ -274,7 +275,7 @@ static int ldb_load_modules_list(struct ldb_context *ldb, const char **module_li
 	return LDB_SUCCESS;
 }
 
-static int ldb_init_module_chain(struct ldb_context *ldb, struct ldb_module *module) 
+int ldb_init_module_chain(struct ldb_context *ldb, struct ldb_module *module) 
 {
 	while (module && module->ops->init_context == NULL) 
 		module = module->next;
-- 
cgit 


From faed8175063b16df94d5332581baf1af0562bb09 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 13 Aug 2006 07:33:57 +0000
Subject: r17514: Simplify the way to set ldb errors and add another helper
 function to set them. (This used to be commit
 260868bae56194fcb98d55afc22fc66d96a303df)

---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index d38c873c3b..e863a2beb5 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -369,7 +369,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 	module = module->next; \
 	while (module && module->ops->op == NULL) module = module->next; \
 	if (module == NULL) { \
-		ldb_set_errstring(ldb, talloc_strdup(ldb, "Unable to find backend operation for " #op )); \
+		ldb_asprintf_errstring(ldb, "Unable to find backend operation for " #op ); \
 		return LDB_ERR_OPERATIONS_ERROR;	\
 	}						\
 } while (0)
-- 
cgit 


From 99309fac5c924ef467e7518a2deb521bf34ffa72 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 23 Aug 2006 00:46:40 +0000
Subject: r17730: cast dlsym result to try to avoid a compiler crash on hpux
 (This used to be commit 217cff9f00e350b769e40ff1d71ebbd5696c2938)

---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index e863a2beb5..cfb84e446f 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -221,7 +221,7 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
 		return -1;
 	}
 
-	init_fn = dlsym(handle, "init_module");
+	init_fn = (int (*)(void))dlsym(handle, "init_module");
 
 	if (init_fn == NULL) {
 		ldb_debug(ldb, LDB_DEBUG_ERROR, "no symbol `init_module' found in %s: %s\n", path, dlerror());
-- 
cgit 


From eb6f27eccc089899205f777a710e43ed6ea314d9 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 24 Aug 2006 09:41:10 +0000
Subject: r17778: fix compiler warnings

metze
(This used to be commit 4f753f9ebc8ea9e37f1fee5fa84e020885b196a8)
---
 source4/lib/ldb/common/ldb_modules.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index cfb84e446f..054a830bfb 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -135,6 +135,8 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 	return NULL;
 }
 
+#ifndef STATIC_ldb_MODULES
+
 #ifdef HAVE_LDAP
 #define LDAP_INIT ldb_ldap_init,
 #else
@@ -147,7 +149,6 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 #define SQLITE3_INIT
 #endif
 
-#ifndef STATIC_ldb_MODULES
 #define STATIC_ldb_MODULES \
 	{	\
 		LDAP_INIT \
-- 
cgit 


From 58619eebc10cf3e1828f8ecad1362d98ca4e9845 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 22 Sep 2006 23:22:39 +0000
Subject: r18831: minor build changes for samba3. The logging changes will be
 removed when the tdb api is updated (This used to be commit
 6ace943fac101839e35cbc83dc54fde2068f704b)

---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 054a830bfb..06a8a4bcf6 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -36,7 +36,7 @@
 #include "includes.h"
 #include "ldb/include/includes.h"
 
-#ifdef _SAMBA_BUILD_
+#if (_SAMBA_BUILD_ >= 4)
 #include "build.h"
 #include "dynconfig.h"
 #endif
-- 
cgit 


From 95340f8afb12b8c9bcaaa230b4cad74e77a79a9c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 25 Sep 2006 16:59:00 +0000
Subject: r18903: merge from samba3:

define HAVE_LDB_LDAP and HAVE_LDB_SQLITE3

metze
(This used to be commit 4e2f5ba490d717283ab089d90ebd5c108a8c53b0)
---
 source4/lib/ldb/common/ldb_modules.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 06a8a4bcf6..adbbe58e10 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -137,13 +137,13 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 
 #ifndef STATIC_ldb_MODULES
 
-#ifdef HAVE_LDAP
+#ifdef HAVE_LDB_LDAP
 #define LDAP_INIT ldb_ldap_init,
 #else
 #define LDAP_INIT
 #endif
 
-#ifdef HAVE_SQLITE3
+#ifdef HAVE_LDB_SQLITE3
 #define SQLITE3_INIT ldb_sqlite3_init,
 #else
 #define SQLITE3_INIT
-- 
cgit 


From 36246a191c08a869dd3a8e509fe96f3c5c6bfc23 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 6 Oct 2006 06:38:26 +0000
Subject: r19112: fixed a checker warning.

In case you haven't noticed, lots of our packages now run the IBM
checker in the build farm on 'snab'
(This used to be commit b39a79f17c9d8729264436bb774e8bd2b88e12f9)
---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index adbbe58e10..fa403658ee 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -324,7 +324,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		}
 
 		ret = ldb_search(ldb, mods_dn, LDB_SCOPE_BASE, "", attrs, &res);
-		if (res) talloc_steal(mods_dn, res);
+		talloc_steal(mods_dn, res);
 		if (ret == LDB_SUCCESS && (res->count == 0 || res->msgs[0]->num_elements == 0)) {
 			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
 		} else {
-- 
cgit 


From c403dd11fb33755809a23338ecac99676d766b88 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 9 Oct 2006 08:00:18 +0000
Subject: r19188: merge from samba3:

fix compiler warnings

metze
(This used to be commit dc139d8715f58b27363266f1426da451907845eb)
---
 source4/lib/ldb/common/ldb_modules.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index fa403658ee..3b0009ae47 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -81,7 +81,8 @@ const char **ldb_modules_list_from_string(struct ldb_context *ldb, TALLOC_CTX *m
 	int i;
 
 	/* spaces not admitted */
-	modstr = talloc_strdup_no_spaces(mem_ctx, string);
+	modstr = talloc_strdup_no_spaces((struct ldb_context *)mem_ctx,
+					 string);
 	if ( ! modstr) {
 		return NULL;
 	}
-- 
cgit 


From bbc056e067e1b721dc2ef6958ab653c1eddec3a1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 9 Oct 2006 09:56:13 +0000
Subject: r19196: merge from samba3:

pass always a mem_ctx to functions and a ldb_context where needed

metze
(This used to be commit 67a6a41ba3af840cd8226de73576a90ecf602caa)
---
 source4/lib/ldb/common/ldb_modules.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 3b0009ae47..d627f3b9fa 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -44,14 +44,13 @@
 #define LDB_MODULE_PREFIX	"modules:"
 #define LDB_MODULE_PREFIX_LEN	8
 
-static char *talloc_strdup_no_spaces(struct ldb_context *ldb, const char *string)
+static char *ldb_modules_strdup_no_spaces(TALLOC_CTX *mem_ctx, const char *string)
 {
 	int i, len;
 	char *trimmed;
 
-	trimmed = talloc_strdup(ldb, string);
+	trimmed = talloc_strdup(mem_ctx, string);
 	if (!trimmed) {
-		ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in talloc_strdup_trim_spaces()\n");
 		return NULL;
 	}
 
@@ -81,9 +80,9 @@ const char **ldb_modules_list_from_string(struct ldb_context *ldb, TALLOC_CTX *m
 	int i;
 
 	/* spaces not admitted */
-	modstr = talloc_strdup_no_spaces((struct ldb_context *)mem_ctx,
-					 string);
+	modstr = ldb_modules_strdup_no_spaces(mem_ctx, string);
 	if ( ! modstr) {
+		ldb_debug(ldb, LDB_DEBUG_FATAL, "Out of Memory in ldb_modules_strdup_no_spaces()\n");
 		return NULL;
 	}
 
-- 
cgit 


From e36ea2e8ebe44079dd3989694f0235e77caf4fe2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 17 Oct 2006 01:21:02 +0000
Subject: r19362: - don't need to store the baseinfo message after cache load

- set better names on talloc structures in ldb modules, making leaks
  easier to track down
(This used to be commit 3bf76db42dc6dde5d71083216dba819869b31c75)
---
 source4/lib/ldb/common/ldb_modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index d627f3b9fa..325cab6dfd 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -266,6 +266,7 @@ int ldb_load_modules_list(struct ldb_context *ldb, const char **module_list, str
 		if (current == NULL) {
 			return LDB_ERR_OPERATIONS_ERROR;
 		}
+		talloc_set_name(current, "ldb_module: %s", module_list[i]);
 		
 		current->ldb = ldb;
 		current->ops = ops;
-- 
cgit 


From 92ec8e5c1e1fcc5aa8814b4b4d41ea16c548e4ad Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 22 Oct 2006 21:16:46 +0000
Subject: r19454: In standalone build init asq too (This used to be commit
 e58b03cd666c6e5df8e5720a62aef23f87be9362)

---
 source4/lib/ldb/common/ldb_modules.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 325cab6dfd..ada3d99930 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -160,6 +160,7 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 		ldb_objectclass_init,	\
 		ldb_paged_results_init,	\
 		ldb_sort_init,		\
+		ldb_asq_init,		\
 		NULL			\
 	}
 #endif
-- 
cgit 


From 4fa24df98ded939c68bdc95e9f09334caeeb84af Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 29 Oct 2006 17:40:19 +0000
Subject: r19507: Merge my DSO fixes branch. Building Samba's libraries as
 shared libraries works again now, by specifying --enable-dso to configure.
 (This used to be commit 7a01235067a4800b07b8919a6a475954bfb0b04c)

---
 source4/lib/ldb/common/ldb_modules.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index ada3d99930..f1138afd81 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -207,17 +207,26 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
 	char *path;
 	void *handle;
 	int (*init_fn) (void);
+	char *modulesdir;
 
 #ifdef HAVE_DLOPEN
+	if (getenv("LD_LDB_MODULE_PATH") != NULL) {
+		modulesdir = talloc_strdup(ldb, getenv("LD_LDB_MODULE_PATH"));
+	} else {
 #ifdef _SAMBA_BUILD_
-	path = talloc_asprintf(ldb, "%s/ldb/%s.%s", dyn_MODULESDIR, name, dyn_SHLIBEXT);
+		modulesdir = talloc_asprintf(ldb, "%s/ldb", dyn_MODULESDIR);
 #else
-	path = talloc_asprintf(ldb, "%s/%s.%s", MODULESDIR, name, SHLIBEXT);
+		modulesdir = talloc_strdup(ldb, MODULESDIR);
 #endif
+	}
+
+	path = talloc_asprintf(ldb, "%s/%s.%s", modulesdir, name, SHLIBEXT);
+
+	talloc_free(modulesdir);
 
 	ldb_debug(ldb, LDB_DEBUG_TRACE, "trying to load %s from %s\n", name, path);
 
-	handle = dlopen(path, 0);
+	handle = dlopen(path, RTLD_NOW);
 	if (handle == NULL) {
 		ldb_debug(ldb, LDB_DEBUG_WARNING, "unable to load %s from %s: %s\n", name, path, dlerror());
 		return -1;
-- 
cgit 


From a7127ad79ebc8c5dc861bffd8e51c4ec31e5c046 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 16 Nov 2006 11:15:02 +0000
Subject: r19743: merge from samba3:

remove old unused schema module

metze
(This used to be commit 3c16951b0d88013b34a0213ced79087653713ddf)
---
 source4/lib/ldb/common/ldb_modules.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index f1138afd81..a6997b324a 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -154,7 +154,6 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 		LDAP_INIT \
 		SQLITE3_INIT \
 		ldb_tdb_init, 	\
-		ldb_schema_init,	\
 		ldb_operational_init,	\
 		ldb_rdn_name_init,	\
 		ldb_objectclass_init,	\
-- 
cgit 


From 4889eb9f7aae9349e426d0f6d2217adff67eaebd Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 22 Nov 2006 00:59:34 +0000
Subject: 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)
---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index a6997b324a..28a619ddeb 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -327,7 +327,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		struct ldb_result *res = NULL;
 		struct ldb_dn *mods_dn;
 
-		mods_dn = ldb_dn_explode(mem_ctx, "@MODULES");
+		mods_dn = ldb_dn_new(mem_ctx, ldb, "@MODULES");
 		if (mods_dn == NULL) {
 			talloc_free(mem_ctx);
 			return -1;
-- 
cgit 


From 23edd6071a10196af7d905fcecad42845179bae3 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 6 Jan 2007 10:21:32 +0000
Subject: r20588: handle extended operations in the ldb_next_request() call

metze
(This used to be commit b98ca57a6504c1b0fce015b1b2c3e4d228dd452e)
---
 source4/lib/ldb/common/ldb_modules.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 28a619ddeb..848ad7e551 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -408,6 +408,9 @@ int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
 	case LDB_RENAME:
 		FIND_OP(module, rename);
 		return module->ops->rename(module, request);
+	case LDB_EXTENDED:
+		FIND_OP(module, extended);
+		return module->ops->extended(module, request);
 	case LDB_SEQUENCE_NUMBER:
 		FIND_OP(module, sequence_number);
 		return module->ops->sequence_number(module, request);
-- 
cgit 


From f80d21069b7e22fbe8abdd59e7acb748f0a6b1ce Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 8 Mar 2007 03:32:28 +0000
Subject: r21760: Try to pin down were some errors are coming from.  Ensure we
 at least name the module.

Andrew Bartlett
(This used to be commit 2e85b1583b3da95db9b5b724b38748ff7d1f9efd)
---
 source4/lib/ldb/common/ldb_modules.c | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 848ad7e551..59a2713df8 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -392,32 +392,49 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 
 int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
 {
+	int ret;
 	switch (request->operation) {
 	case LDB_SEARCH:
 		FIND_OP(module, search);
-		return module->ops->search(module, request);
+		ret = module->ops->search(module, request);
+		break;
 	case LDB_ADD:
 		FIND_OP(module, add);
-		return module->ops->add(module, request);
+		ret = module->ops->add(module, request);
+		break;
 	case LDB_MODIFY:
 		FIND_OP(module, modify);
-		return module->ops->modify(module, request);
+		ret = module->ops->modify(module, request);
+		break;
 	case LDB_DELETE:
 		FIND_OP(module, del);
-		return module->ops->del(module, request);
+		ret = module->ops->del(module, request);
+		break;
 	case LDB_RENAME:
 		FIND_OP(module, rename);
-		return module->ops->rename(module, request);
+		ret = module->ops->rename(module, request);
+		break;
 	case LDB_EXTENDED:
 		FIND_OP(module, extended);
-		return module->ops->extended(module, request);
+		ret = module->ops->extended(module, request);
+		break;
 	case LDB_SEQUENCE_NUMBER:
 		FIND_OP(module, sequence_number);
-		return module->ops->sequence_number(module, request);
+		ret = module->ops->sequence_number(module, request);
+		break;
 	default:
 		FIND_OP(module, request);
-		return module->ops->request(module, request);
+		ret = module->ops->request(module, request);
+		break;
+	}
+	if (ret == LDB_SUCCESS) {
+		return ret;
 	}
+	if (!ldb_errstring(module->ldb)) {
+		/* Set a default error string, to place the blame somewhere */
+		ldb_asprintf_errstring(module->ldb, "error in module %s: %s", module->ops->name, ldb_strerror(ret));
+	}
+	return ret;
 }
 
 int ldb_next_init(struct ldb_module *module)
-- 
cgit 


From 3370f2f2d7e5296e8f54f721003c07fac111d1ad Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 8 Mar 2007 06:23:39 +0000
Subject: r21761: - Give more detail on LDAP client library failures (make it
 clear   where the error is from)

- Make default error string more consistant

Andrew Bartlett
(This used to be commit 7f115579d20a3112efd11444fafcbf78698fc9a1)
---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 59a2713df8..e10332a0e1 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -432,7 +432,7 @@ int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
 	}
 	if (!ldb_errstring(module->ldb)) {
 		/* Set a default error string, to place the blame somewhere */
-		ldb_asprintf_errstring(module->ldb, "error in module %s: %s", module->ops->name, ldb_strerror(ret));
+		ldb_asprintf_errstring(module->ldb, "error in module %s: %s (%d)", module->ops->name, ldb_strerror(ret), ret);
 	}
 	return ret;
 }
-- 
cgit 


From 52fb06edc25e8538c413df1aaabba18c859a00cf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 5 May 2007 18:50:56 +0000
Subject: r22681: Fix standalone ldb build when parent directory name != ldb.
 (This used to be commit 1093875d59f1ea9b8bd82277d4f9d8366e584952)

---
 source4/lib/ldb/common/ldb_modules.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index e10332a0e1..dc49d8d12b 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -33,10 +33,10 @@
  *  Author: Simo Sorce
  */
 
-#include "includes.h"
-#include "ldb/include/includes.h"
+#include "ldb_includes.h"
 
 #if (_SAMBA_BUILD_ >= 4)
+#include "includes.h"
 #include "build.h"
 #include "dynconfig.h"
 #endif
-- 
cgit 


From 31b47acf525d4b7b68f53920b33f599e20a623fb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 7 May 2007 15:29:25 +0000
Subject: r22750: dlopen() is always available now (and returns a correct error
 if not supported by the system), thanks to libreplace. (This used to be
 commit 1152a4f56d7402bf3aa00b5b108c5c6c668cec6b)

---
 source4/lib/ldb/common/ldb_modules.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index dc49d8d12b..e4b666c454 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -208,7 +208,6 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
 	int (*init_fn) (void);
 	char *modulesdir;
 
-#ifdef HAVE_DLOPEN
 	if (getenv("LD_LDB_MODULE_PATH") != NULL) {
 		modulesdir = talloc_strdup(ldb, getenv("LD_LDB_MODULE_PATH"));
 	} else {
@@ -241,10 +240,6 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
 	talloc_free(path);
 
 	return init_fn();
-#else
-	ldb_debug(ldb, LDB_DEBUG_TRACE, "no dlopen() - not trying to load %s module\n", name);
-	return -1;
-#endif
 }
 
 int ldb_load_modules_list(struct ldb_context *ldb, const char **module_list, struct ldb_module *backend, struct ldb_module **out)
-- 
cgit 


From 2dacfdf099755cc42df6c669ee7d13d0e3688c2f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 11 May 2007 09:24:41 +0000
Subject: r22789: fix loading of internal samba4 modules

metze
(This used to be commit f6740c8b7abdaa65c8467220bf2d14e21fe71053)
---
 source4/lib/ldb/common/ldb_modules.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index e4b666c454..788c607d4e 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -135,7 +135,7 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 	return NULL;
 }
 
-#ifndef STATIC_ldb_MODULES
+#ifndef STATIC_LIBLDB_MODULES
 
 #ifdef HAVE_LDB_LDAP
 #define LDAP_INIT ldb_ldap_init,
@@ -149,7 +149,7 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 #define SQLITE3_INIT
 #endif
 
-#define STATIC_ldb_MODULES \
+#define STATIC_LIBLDB_MODULES \
 	{	\
 		LDAP_INIT \
 		SQLITE3_INIT \
@@ -166,7 +166,7 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 
 int ldb_global_init(void)
 {
-	static int (*static_init_fns[])(void) = STATIC_ldb_MODULES;
+	static int (*static_init_fns[])(void) = STATIC_LIBLDB_MODULES;
 
 	static int initialized = 0;
 	int ret = 0, i;
-- 
cgit 


From b8d69a7ea2505b706ff7c74d7c97bc89d82dfa07 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 02:46:15 +0000
Subject: r23795: more v2->v3 conversion (This used to be commit
 84b468b2f8f2dffda89593f816e8bc6a8b6d42ac)

---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 788c607d4e..d3001bbff2 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -11,7 +11,7 @@
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   version 3 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- 
cgit 


From 6c973f4e8ccbcb6c9275f8a54e26abb19df7e15a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 03:42:26 +0000
Subject: r23798: updated old Temple Place FSF addresses to new URL (This used
 to be commit 40c0919aaa9c1b14bbaebb95ecce53eb0380fdbb)

---
 source4/lib/ldb/common/ldb_modules.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index d3001bbff2..24441f0010 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -19,8 +19,7 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
-- 
cgit 


From 49c42e2550fe7340b88e910f621fef1678b571e3 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 7 Aug 2007 04:29:42 +0000
Subject: r24261: Fix the standalone ldb build after I moved the objectclass
 module out.

Andrew Bartlett
(This used to be commit c4c3afcdcb6ac5dc220f353b25689056484ac6c9)
---
 source4/lib/ldb/common/ldb_modules.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 24441f0010..ad537b4d86 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -1,4 +1,3 @@
-
 /* 
    ldb database library
 
@@ -155,7 +154,6 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 		ldb_tdb_init, 	\
 		ldb_operational_init,	\
 		ldb_rdn_name_init,	\
-		ldb_objectclass_init,	\
 		ldb_paged_results_init,	\
 		ldb_sort_init,		\
 		ldb_asq_init,		\
-- 
cgit 


From e10577585dae0807ff85a5b7ad1f640ea4ec3286 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 20 Aug 2007 00:22:08 +0000
Subject: r24566: Remove trailing newlines in ldb_debug(), these are not
 required.

Andrew Bartlett
(This used to be commit 2ed782f7caa98003c524d70bcb97874002be57a2)
---
 source4/lib/ldb/common/ldb_modules.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index ad537b4d86..2c9fba590a 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -328,7 +328,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		ret = ldb_search(ldb, mods_dn, LDB_SCOPE_BASE, "", attrs, &res);
 		talloc_steal(mods_dn, res);
 		if (ret == LDB_SUCCESS && (res->count == 0 || res->msgs[0]->num_elements == 0)) {
-			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
+			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db");
 		} else {
 			if (ret != LDB_SUCCESS) {
 				ldb_debug(ldb, LDB_DEBUG_FATAL, "ldb error (%s) occurred searching for modules, bailing out\n", ldb_errstring(ldb));
@@ -356,7 +356,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			return ret;
 		}
 	} else {
-		ldb_debug(ldb, LDB_DEBUG_TRACE, "No modules specified for this database\n");
+		ldb_debug(ldb, LDB_DEBUG_TRACE, "No modules specified for this database");
 	}
 
 	return ldb_init_module_chain(ldb, ldb->modules);
-- 
cgit 


From ed2a1c718ae4fb56fdfe73da6f63ddb7fb15d9fd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 11 Sep 2007 15:42:19 +0000
Subject: r25081: Add modules_dir member to ldb_context that is used rather
 than a global modulesdir setting. Samba always sets this to
 lp_modulesdir()/ldb (This used to be commit
 e672380d2156cf0421108a9c34f04f096c2afeed)

---
 source4/lib/ldb/common/ldb_modules.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 2c9fba590a..b279af98f6 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -42,6 +42,12 @@
 #define LDB_MODULE_PREFIX	"modules:"
 #define LDB_MODULE_PREFIX_LEN	8
 
+void ldb_set_modules_dir(struct ldb_context *ldb, const char *path)
+{
+	talloc_free(ldb->modules_dir);
+	ldb->modules_dir = talloc_strdup(ldb, path);
+}
+
 static char *ldb_modules_strdup_no_spaces(TALLOC_CTX *mem_ctx, const char *string)
 {
 	int i, len;
@@ -203,21 +209,12 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
 	char *path;
 	void *handle;
 	int (*init_fn) (void);
-	char *modulesdir;
 
-	if (getenv("LD_LDB_MODULE_PATH") != NULL) {
-		modulesdir = talloc_strdup(ldb, getenv("LD_LDB_MODULE_PATH"));
-	} else {
-#ifdef _SAMBA_BUILD_
-		modulesdir = talloc_asprintf(ldb, "%s/ldb", dyn_MODULESDIR);
-#else
-		modulesdir = talloc_strdup(ldb, MODULESDIR);
-#endif
-	}
-
-	path = talloc_asprintf(ldb, "%s/%s.%s", modulesdir, name, SHLIBEXT);
+	if (ldb->modules_dir == NULL)
+		return -1;
 
-	talloc_free(modulesdir);
+	path = talloc_asprintf(ldb, "%s/%s.%s", ldb->modules_dir, name, 
+			       SHLIBEXT);
 
 	ldb_debug(ldb, LDB_DEBUG_TRACE, "trying to load %s from %s\n", name, path);
 
-- 
cgit 


From 4a4cdc990cdc9e29b63fd28c5aa58ae1b47ed174 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 11 Sep 2007 16:06:32 +0000
Subject: r25084: Move samba-specific code out of lib/ldb directory. (This used
 to be commit 917bd737cb07817664d9088860588d47525f5ff8)

---
 source4/lib/ldb/common/ldb_modules.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index b279af98f6..9f94c90c92 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -36,7 +36,6 @@
 #if (_SAMBA_BUILD_ >= 4)
 #include "includes.h"
 #include "build.h"
-#include "dynconfig.h"
 #endif
 
 #define LDB_MODULE_PREFIX	"modules:"
-- 
cgit 


From 2de30ecd942e05e5416a9f14c91d58324a0bc6eb Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 30 Oct 2007 23:35:04 +0100
Subject: r25755: Fix a couple of memory leaks, in particular a new leak onto
 the NULL

context caused by my objectclass module work.

Andrew Bartlett
(This used to be commit 2a835d900fee71e4461d5d18e39b4358fa6fdfba)
---
 source4/lib/ldb/common/ldb_modules.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 9f94c90c92..87e5b2eeb3 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -347,15 +347,17 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 
 	if (modules != NULL) {
 		ret = ldb_load_modules_list(ldb, modules, ldb->modules, &ldb->modules);
-		talloc_free(modules);
 		if (ret != LDB_SUCCESS) {
+			talloc_free(mem_ctx);
 			return ret;
 		}
 	} else {
 		ldb_debug(ldb, LDB_DEBUG_TRACE, "No modules specified for this database");
 	}
 
-	return ldb_init_module_chain(ldb, ldb->modules);
+	ret = ldb_init_module_chain(ldb, ldb->modules);
+	talloc_free(mem_ctx);
+	return ret;
 }
 
 /*
-- 
cgit 


From e3198b3acde1f737266ce2b1de738f08314d530c Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 6 Nov 2007 03:46:57 +0100
Subject: r25856: If the search fails, it is not valid to steal 'res'.

Andrew Bartlett
(This used to be commit f4d733c3d00c90ac2e02fcc202240ae7c290463e)
---
 source4/lib/ldb/common/ldb_modules.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 87e5b2eeb3..2ffd49786b 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -322,15 +322,16 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 		}
 
 		ret = ldb_search(ldb, mods_dn, LDB_SCOPE_BASE, "", attrs, &res);
+		
+		if (ret != LDB_SUCCESS) {
+			ldb_debug(ldb, LDB_DEBUG_FATAL, "ldb error (%s) occurred searching for modules, bailing out\n", ldb_errstring(ldb));
+			talloc_free(mem_ctx);
+			return -1;
+		}
 		talloc_steal(mods_dn, res);
-		if (ret == LDB_SUCCESS && (res->count == 0 || res->msgs[0]->num_elements == 0)) {
+		if (res->count == 0 || res->msgs[0]->num_elements == 0) {
 			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db");
 		} else {
-			if (ret != LDB_SUCCESS) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "ldb error (%s) occurred searching for modules, bailing out\n", ldb_errstring(ldb));
-				talloc_free(mem_ctx);
-				return -1;
-			}
 			if (res->count > 1) {
 				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%d), bailing out\n", res->count);
 				talloc_free(mem_ctx);
-- 
cgit 


From 08dd389ddfe4da99ae8463c017608bc0b95f560f Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 13 Nov 2007 04:32:36 +0100
Subject: r25934: Handle a LDB_ERR_NO_SUCH_OBJECT return value when looking for
 the

modules.

This will be useful when we start enforcing validity in base DNs.

Andrew Bartlett
(This used to be commit aa8348a27a6938a1a26d4a7ed3b7405966202ad8)
---
 source4/lib/ldb/common/ldb_modules.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 2ffd49786b..845628d3ac 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -323,24 +323,27 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 
 		ret = ldb_search(ldb, mods_dn, LDB_SCOPE_BASE, "", attrs, &res);
 		
-		if (ret != LDB_SUCCESS) {
+		if (ret == LDB_ERR_NO_SUCH_OBJECT) {
+			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db");
+		} else if (ret != LDB_SUCCESS) {
 			ldb_debug(ldb, LDB_DEBUG_FATAL, "ldb error (%s) occurred searching for modules, bailing out\n", ldb_errstring(ldb));
 			talloc_free(mem_ctx);
 			return -1;
-		}
-		talloc_steal(mods_dn, res);
-		if (res->count == 0 || res->msgs[0]->num_elements == 0) {
-			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db");
 		} else {
-			if (res->count > 1) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%d), bailing out\n", res->count);
-				talloc_free(mem_ctx);
-				return -1;
+			talloc_steal(mods_dn, res);
+			if (res->count == 0 || res->msgs[0]->num_elements == 0) {
+				ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db");
+			} else {
+				if (res->count > 1) {
+					ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%d), bailing out\n", res->count);
+					talloc_free(mem_ctx);
+					return -1;
+				}
+				
+				modules = ldb_modules_list_from_string(ldb, mem_ctx,
+								       (const char *)res->msgs[0]->elements[0].values[0].data);
+				
 			}
-
-			modules = ldb_modules_list_from_string(ldb, mem_ctx,
-							       (const char *)res->msgs[0]->elements[0].values[0].data);
-
 		}
 
 		talloc_free(mods_dn);
-- 
cgit 


From f6312d1b5a55bedbed2d5bd85537663445ec2daf Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 15 Nov 2007 05:54:51 +0100
Subject: r25962: Move to more modern ldb functions loading module list.

Andrew Bartlett
(This used to be commit c3bfcf44a49c6a19579c85fb3660331177a436fb)
---
 source4/lib/ldb/common/ldb_modules.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 845628d3ac..d2e55c048e 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -321,28 +321,29 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			return -1;
 		}
 
-		ret = ldb_search(ldb, mods_dn, LDB_SCOPE_BASE, "", attrs, &res);
+		ret = ldb_search_exp_fmt(ldb, mods_dn, &res, mods_dn, LDB_SCOPE_BASE, attrs, "@LIST=*");
 		
 		if (ret == LDB_ERR_NO_SUCH_OBJECT) {
 			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db");
 		} else if (ret != LDB_SUCCESS) {
 			ldb_debug(ldb, LDB_DEBUG_FATAL, "ldb error (%s) occurred searching for modules, bailing out\n", ldb_errstring(ldb));
 			talloc_free(mem_ctx);
-			return -1;
+			return ret;
 		} else {
-			talloc_steal(mods_dn, res);
-			if (res->count == 0 || res->msgs[0]->num_elements == 0) {
+			const char *module_list;
+			if (res->count == 0) {
 				ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db");
+			} else if (res->count > 1) {
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%d), bailing out\n", res->count);
+				talloc_free(mem_ctx);
+				return -1;
 			} else {
-				if (res->count > 1) {
-					ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%d), bailing out\n", res->count);
-					talloc_free(mem_ctx);
-					return -1;
+				module_list = ldb_msg_find_attr_as_string(res->msgs[0], "@LIST", NULL);
+				if (!module_list) {
+					ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db");
 				}
-				
 				modules = ldb_modules_list_from_string(ldb, mem_ctx,
-								       (const char *)res->msgs[0]->elements[0].values[0].data);
-				
+							       module_list);
 			}
 		}
 
-- 
cgit 


From dbf77b640516b7a412aed2597a15ec2ddf4c17b5 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Dec 2007 00:56:11 +0100
Subject: r26299: Print out which module failed to initialise.

Andrew Bartlett
(This used to be commit 6628d9f843d773ec1a5841f793b16f76910c39c4)
---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index d2e55c048e..82973a4149 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -281,7 +281,7 @@ int ldb_init_module_chain(struct ldb_context *ldb, struct ldb_module *module)
 
 	if (module && module->ops->init_context &&
 		module->ops->init_context(module) != LDB_SUCCESS) {
-		ldb_debug(ldb, LDB_DEBUG_FATAL, "module initialization failed\n");
+		ldb_debug(ldb, LDB_DEBUG_FATAL, "module %s initialization failed\n", module->ops->name);
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
-- 
cgit 


From 89144dfeade7d96527ebe5321ee0328662d81afd Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 5 Dec 2007 01:25:07 +0100
Subject: r26301: Collapose ldb_next_init() into being a caller of
 ldb_init_module_chain

and therefore further improve debug output.

Andrew Bartlett
(This used to be commit 5e93ca2ea16a7d10d63606ae539c0fdc4e224556)
---
 source4/lib/ldb/common/ldb_modules.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 82973a4149..508389e374 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -279,10 +279,15 @@ int ldb_init_module_chain(struct ldb_context *ldb, struct ldb_module *module)
 	while (module && module->ops->init_context == NULL) 
 		module = module->next;
 
-	if (module && module->ops->init_context &&
-		module->ops->init_context(module) != LDB_SUCCESS) {
-		ldb_debug(ldb, LDB_DEBUG_FATAL, "module %s initialization failed\n", module->ops->name);
-		return LDB_ERR_OPERATIONS_ERROR;
+	/* init is different in that it is not an error if modules
+	 * do not require initialization */
+
+	if (module) {
+		int ret = module->ops->init_context(module);
+		if (ret != LDB_SUCCESS) {
+			ldb_debug(ldb, LDB_DEBUG_FATAL, "module %s initialization failed\n", module->ops->name);
+			return ret;
+		}
 	}
 
 	return LDB_SUCCESS;
@@ -434,18 +439,9 @@ int ldb_next_request(struct ldb_module *module, struct ldb_request *request)
 
 int ldb_next_init(struct ldb_module *module)
 {
-	/* init is different in that it is not an error if modules
-	 * do not require initialization */
-
 	module = module->next;
 
-	while (module && module->ops->init_context == NULL) 
-		module = module->next;
-
-	if (module == NULL) 
-		return LDB_SUCCESS;
-
-	return module->ops->init_context(module);
+	return ldb_init_module_chain(module->ldb, module);
 }
 
 int ldb_next_start_trans(struct ldb_module *module)
-- 
cgit 


From b8850f326befab8a745e2b880214159908e7ec58 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 12 Dec 2007 02:15:42 +0100
Subject: r26410: Remove unnecessary static. (This used to be commit
 13ae3108dad2f9f0f7a421d672751fa594f4e3fb)

---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 508389e374..877c28e8fd 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -168,7 +168,7 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 
 int ldb_global_init(void)
 {
-	static int (*static_init_fns[])(void) = STATIC_LIBLDB_MODULES;
+	int (*static_init_fns[])(void) = STATIC_LIBLDB_MODULES;
 
 	static int initialized = 0;
 	int ret = 0, i;
-- 
cgit 


From cb62bbbb7c2ee542a3a5f978ed25e501825a44d7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 17 Dec 2007 03:35:59 +0100
Subject: r26481: Make function for loading symbol from DSO more generic, and
 allow modules to provide an ops table directly rather than an initialization
 function. (This used to be commit a71419a73a869c24121005ccbbcb4396f888888b)

---
 source4/lib/ldb/common/ldb_modules.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 877c28e8fd..72ed969298 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -203,14 +203,15 @@ int ldb_register_module(const struct ldb_module_ops *ops)
 	return 0;
 }
 
-int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
+void *ldb_dso_load_symbol(struct ldb_context *ldb, const char *name,
+			    const char *symbol)
 {
 	char *path;
 	void *handle;
-	int (*init_fn) (void);
+	void *sym;
 
 	if (ldb->modules_dir == NULL)
-		return -1;
+		return NULL;
 
 	path = talloc_asprintf(ldb, "%s/%s.%s", ldb->modules_dir, name, 
 			       SHLIBEXT);
@@ -220,19 +221,19 @@ int ldb_try_load_dso(struct ldb_context *ldb, const char *name)
 	handle = dlopen(path, RTLD_NOW);
 	if (handle == NULL) {
 		ldb_debug(ldb, LDB_DEBUG_WARNING, "unable to load %s from %s: %s\n", name, path, dlerror());
-		return -1;
+		return NULL;
 	}
 
-	init_fn = (int (*)(void))dlsym(handle, "init_module");
+	sym = (int (*)(void))dlsym(handle, symbol);
 
-	if (init_fn == NULL) {
-		ldb_debug(ldb, LDB_DEBUG_ERROR, "no symbol `init_module' found in %s: %s\n", path, dlerror());
-		return -1;
+	if (sym == NULL) {
+		ldb_debug(ldb, LDB_DEBUG_ERROR, "no symbol `%s' found in %s: %s\n", symbol, path, dlerror());
+		return NULL;
 	}
 
 	talloc_free(path);
 
-	return init_fn();
+	return sym;
 }
 
 int ldb_load_modules_list(struct ldb_context *ldb, const char **module_list, struct ldb_module *backend, struct ldb_module **out)
@@ -248,10 +249,19 @@ int ldb_load_modules_list(struct ldb_context *ldb, const char **module_list, str
 		
 		ops = ldb_find_module_ops(module_list[i]);
 		if (ops == NULL) {
-			if (ldb_try_load_dso(ldb, module_list[i]) == 0) {
+			int (*init_fn) (void);
+
+			init_fn = ldb_dso_load_symbol(ldb, module_list[i], 
+						      "init_module");
+			if (init_fn != NULL && init_fn() == 0) {
 				ops = ldb_find_module_ops(module_list[i]);
 			}
 		}
+
+		if (ops == NULL) {
+			ops = ldb_dso_load_symbol(ldb, module_list[i], 
+						      "ldb_module_ops");
+		}
 		
 		if (ops == NULL) {
 			ldb_debug(ldb, LDB_DEBUG_WARNING, "WARNING: Module [%s] not found\n", 
-- 
cgit 


From be33f4c611d37ebba59ff618033dc73601339ad1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 23 Dec 2007 23:54:30 -0600
Subject: r26576: Allow the static module loading code to be used for the
 Python modules.

Simplify the way module initialization functions are handled.
(This used to be commit ba8be2dfc0de4434c798663336b81f7f95cde520)
---
 source4/lib/ldb/common/ldb_modules.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 72ed969298..f30206dc5b 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -168,7 +168,7 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 
 int ldb_global_init(void)
 {
-	int (*static_init_fns[])(void) = STATIC_LIBLDB_MODULES;
+	int (*static_init_fns[])(void) = { STATIC_LIBLDB_MODULES, NULL };
 
 	static int initialized = 0;
 	int ret = 0, i;
-- 
cgit 


From 9852e793bcdd04bbb40c2d03424d6fe9f1098bc0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Dec 2007 00:10:08 -0600
Subject: r26577: Fix the standalone ldb build. (This used to be commit
 1cf374eb3125c66844f01d013016feaf99760582)

---
 source4/lib/ldb/common/ldb_modules.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index f30206dc5b..4e70b177bc 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -153,17 +153,14 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 #endif
 
 #define STATIC_LIBLDB_MODULES \
-	{	\
-		LDAP_INIT \
-		SQLITE3_INIT \
-		ldb_tdb_init, 	\
-		ldb_operational_init,	\
-		ldb_rdn_name_init,	\
-		ldb_paged_results_init,	\
-		ldb_sort_init,		\
-		ldb_asq_init,		\
-		NULL			\
-	}
+	LDAP_INIT \
+	SQLITE3_INIT \
+	ldb_tdb_init, 	\
+	ldb_operational_init,	\
+	ldb_rdn_name_init,	\
+	ldb_paged_results_init,	\
+	ldb_sort_init,		\
+	ldb_asq_init
 #endif
 
 int ldb_global_init(void)
-- 
cgit 


From c13ae707313c5bf9819a75c1699d099565d2494d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Dec 2007 01:28:22 -0600
Subject: r26580: Include sentinel in build.h, in case the list is empty. (This
 used to be commit f1997dabed584bdc864c4b7235c29603c312ef46)

---
 source4/lib/ldb/common/ldb_modules.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 4e70b177bc..18070bdb86 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -160,12 +160,13 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 	ldb_rdn_name_init,	\
 	ldb_paged_results_init,	\
 	ldb_sort_init,		\
-	ldb_asq_init
+	ldb_asq_init, \
+	NULL
 #endif
 
 int ldb_global_init(void)
 {
-	int (*static_init_fns[])(void) = { STATIC_LIBLDB_MODULES, NULL };
+	int (*static_init_fns[])(void) = { STATIC_LIBLDB_MODULES };
 
 	static int initialized = 0;
 	int ret = 0, i;
-- 
cgit 


From b66ee2ed22754dd44b20c06e573072e328d9a3dd Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 16 Feb 2008 18:38:02 +0100
Subject: Move responsibilities of build.h to makefile. (This used to be commit
 a43f6d37bce85748e9cf2675e5beced5db26f1c3)

---
 source4/lib/ldb/common/ldb_modules.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 18070bdb86..a3bf71d0d8 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -35,7 +35,6 @@
 
 #if (_SAMBA_BUILD_ >= 4)
 #include "includes.h"
-#include "build.h"
 #endif
 
 #define LDB_MODULE_PREFIX	"modules:"
-- 
cgit 


From 71bc5acead0e16473273eb8741373e865b6d2c44 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 20 Feb 2008 01:37:53 +0100
Subject: Allow ldb backends without init function, use init function-less ldb
 modules. (This used to be commit 141ee91272fb4dafca0149f679e17721b6a3011e)

---
 source4/lib/ldb/common/ldb_modules.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 18070bdb86..2dae40ddb0 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -257,8 +257,13 @@ int ldb_load_modules_list(struct ldb_context *ldb, const char **module_list, str
 		}
 
 		if (ops == NULL) {
-			ops = ldb_dso_load_symbol(ldb, module_list[i], 
-						      "ldb_module_ops");
+			char *symbol_name = talloc_asprintf(ldb, "ldb_%s_module_ops", 
+												module_list[i]);
+			if (symbol_name == NULL) {
+				return LDB_ERR_OPERATIONS_ERROR;
+			}
+			ops = ldb_dso_load_symbol(ldb, module_list[i], symbol_name);
+			talloc_free(symbol_name);
 		}
 		
 		if (ops == NULL) {
-- 
cgit 


From 995788536e5ba7b3a0e67e377a9769b279d0b8ae Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 20 Feb 2008 02:57:07 +0100
Subject: Remove more function-based inits. (This used to be commit
 b1a7810f3e70f9a831d9b8e85d531e448072adaf)

---
 source4/lib/ldb/common/ldb_modules.c | 66 ++++++++++++------------------------
 1 file changed, 21 insertions(+), 45 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 2dae40ddb0..7da7b9ba34 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -126,9 +126,30 @@ static struct ops_list_entry {
 	struct ops_list_entry *next;	
 } *registered_modules = NULL;
 
+#ifndef STATIC_LIBLDB_MODULES
+
+#define STATIC_LIBLDB_MODULES \
+	ldb_operational_module_ops,	\
+	ldb_rdn_name_module_ops,	\
+	ldb_paged_results_module_ops,	\
+	ldb_sort_module_ops,		\
+	ldb_asq_module_ops, \
+	NULL
+#endif
+
+const static struct ldb_module_ops *builtin_modules[] = {
+	STATIC_LIBLDB_MODULES
+};
+
 static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 {
 	struct ops_list_entry *e;
+	int i;
+
+	for (i = 0; builtin_modules[i]; i++) {
+		if (strcmp(builtin_modules[i]->name, name) == 0)
+			return builtin_modules[i];
+	}
  
 	for (e = registered_modules; e; e = e->next) {
  		if (strcmp(e->ops->name, name) == 0) 
@@ -138,51 +159,6 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 	return NULL;
 }
 
-#ifndef STATIC_LIBLDB_MODULES
-
-#ifdef HAVE_LDB_LDAP
-#define LDAP_INIT ldb_ldap_init,
-#else
-#define LDAP_INIT
-#endif
-
-#ifdef HAVE_LDB_SQLITE3
-#define SQLITE3_INIT ldb_sqlite3_init,
-#else
-#define SQLITE3_INIT
-#endif
-
-#define STATIC_LIBLDB_MODULES \
-	LDAP_INIT \
-	SQLITE3_INIT \
-	ldb_tdb_init, 	\
-	ldb_operational_init,	\
-	ldb_rdn_name_init,	\
-	ldb_paged_results_init,	\
-	ldb_sort_init,		\
-	ldb_asq_init, \
-	NULL
-#endif
-
-int ldb_global_init(void)
-{
-	int (*static_init_fns[])(void) = { STATIC_LIBLDB_MODULES };
-
-	static int initialized = 0;
-	int ret = 0, i;
-
-	if (initialized) 
-		return 0;
-
-	initialized = 1;
-	
-	for (i = 0; static_init_fns[i]; i++) {
-		if (static_init_fns[i]() == -1)
-			ret = -1;
-	}
-
-	return ret;
-}
 
 int ldb_register_module(const struct ldb_module_ops *ops)
 {
-- 
cgit 


From 738fd7fd504c3412128cfae4f8f59ac4f212ae0f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 25 Feb 2008 17:33:28 +0100
Subject: Fix standalone ldb build modules. (This used to be commit
 0b133a30a23757cf463ff22dff6372ae5e11d4c7)

---
 source4/lib/ldb/common/ldb_modules.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index a4e0b94188..af837d2965 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -128,11 +128,11 @@ static struct ops_list_entry {
 #ifndef STATIC_LIBLDB_MODULES
 
 #define STATIC_LIBLDB_MODULES \
-	ldb_operational_module_ops,	\
-	ldb_rdn_name_module_ops,	\
-	ldb_paged_results_module_ops,	\
-	ldb_sort_module_ops,		\
-	ldb_asq_module_ops, \
+	&ldb_operational_module_ops,	\
+	&ldb_rdn_name_module_ops,	\
+	&ldb_paged_results_module_ops,	\
+	&ldb_sort_module_ops,		\
+	&ldb_asq_module_ops, \
 	NULL
 #endif
 
-- 
cgit 


From b5bd6636907c76f6bb562b62abca78a7aeed83d8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 25 Feb 2008 20:40:37 +0100
Subject: Fix use of realpath, fix init functions for ldb. (This used to be
 commit ca510136d2c4cae8f520c76df6aaadb5d412bea1)

---
 source4/lib/ldb/common/ldb_modules.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index af837d2965..ddbe0f23a6 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -125,14 +125,16 @@ static struct ops_list_entry {
 	struct ops_list_entry *next;	
 } *registered_modules = NULL;
 
+#define LDB_MODULE(name) (&ldb_ ## name ## _module_ops)
+
 #ifndef STATIC_LIBLDB_MODULES
 
 #define STATIC_LIBLDB_MODULES \
-	&ldb_operational_module_ops,	\
-	&ldb_rdn_name_module_ops,	\
-	&ldb_paged_results_module_ops,	\
-	&ldb_sort_module_ops,		\
-	&ldb_asq_module_ops, \
+	LDB_MODULE(operational),	\
+	LDB_MODULE(rdn_name),	\
+	LDB_MODULE(paged_results),	\
+	LDB_MODULE(server_sort),		\
+	LDB_MODULE(asq), \
 	NULL
 #endif
 
-- 
cgit 


From 310875e637fd237752770027b28675ed970352dd Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 17 Jun 2008 13:11:29 +1000
Subject: Change our module code to not use the special symbol name
 init_module()

Current glibc libraries include a function called init_module(). If we
use the same name, then a dlsym() can find the glibc function if the
module doesn't have an initialisation function.

In ldb, none of our modules have an init_module(), so we end up calling the libc
functions with bogus arguments.
(This used to be commit 1b0621068998590e7b1e9528b78744dcd2cd5909)
---
 source4/lib/ldb/common/ldb_modules.c | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index ddbe0f23a6..fbfb5e5322 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -223,16 +223,6 @@ int ldb_load_modules_list(struct ldb_context *ldb, const char **module_list, str
 		const struct ldb_module_ops *ops;
 		
 		ops = ldb_find_module_ops(module_list[i]);
-		if (ops == NULL) {
-			int (*init_fn) (void);
-
-			init_fn = ldb_dso_load_symbol(ldb, module_list[i], 
-						      "init_module");
-			if (init_fn != NULL && init_fn() == 0) {
-				ops = ldb_find_module_ops(module_list[i]);
-			}
-		}
-
 		if (ops == NULL) {
 			char *symbol_name = talloc_asprintf(ldb, "ldb_%s_module_ops", 
 												module_list[i]);
-- 
cgit 


From 5ccfd6a90ed81209d055524be51f54cc2f5d8de6 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 28 Jun 2008 10:49:49 +0200
Subject: ldb: allow ldb modules to specify LDB_MODULE(name) or
 LDB_BACKEND(name)

metze
(This used to be commit 1d5b714438a955d76f92f4ccd8aa2f7f89ffa5fd)
---
 source4/lib/ldb/common/ldb_modules.c | 214 ++++++++++++++++++++++++++++++++---
 1 file changed, 198 insertions(+), 16 deletions(-)

(limited to 'source4/lib/ldb/common/ldb_modules.c')

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index fbfb5e5322..4d69dc662e 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -120,36 +120,149 @@ const char **ldb_modules_list_from_string(struct ldb_context *ldb, TALLOC_CTX *m
 	return m;
 }
 
+static struct backends_list_entry {
+	struct ldb_backend_ops *ops;
+	struct backends_list_entry *prev, *next;
+} *ldb_backends = NULL;
+
 static struct ops_list_entry {
 	const struct ldb_module_ops *ops;
 	struct ops_list_entry *next;	
 } *registered_modules = NULL;
 
-#define LDB_MODULE(name) (&ldb_ ## name ## _module_ops)
+static const struct ldb_builtins {
+	const struct ldb_backend_ops *backend_ops;
+	const struct ldb_module_ops *module_ops;
+} builtins[];
 
-#ifndef STATIC_LIBLDB_MODULES
+static ldb_connect_fn ldb_find_backend(const char *url)
+{
+	struct backends_list_entry *backend;
+	int i;
 
-#define STATIC_LIBLDB_MODULES \
-	LDB_MODULE(operational),	\
-	LDB_MODULE(rdn_name),	\
-	LDB_MODULE(paged_results),	\
-	LDB_MODULE(server_sort),		\
-	LDB_MODULE(asq), \
-	NULL
-#endif
+	for (i = 0; builtins[i].backend_ops || builtins[i].module_ops; i++) {
+		if (builtins[i].backend_ops == NULL) continue;
 
-const static struct ldb_module_ops *builtin_modules[] = {
-	STATIC_LIBLDB_MODULES
-};
+		if (strncmp(builtins[i].backend_ops->name, url,
+			    strlen(builtins[i].backend_ops->name)) == 0) {
+			return builtins[i].backend_ops->connect_fn;
+		}
+	}
+
+	for (backend = ldb_backends; backend; backend = backend->next) {
+		if (strncmp(backend->ops->name, url,
+			    strlen(backend->ops->name)) == 0) {
+			return backend->ops->connect_fn;
+		}
+	}
+
+	return NULL;
+}
+
+/*
+ register a new ldb backend
+*/
+int ldb_register_backend(const char *url_prefix, ldb_connect_fn connectfn)
+{
+	struct ldb_backend_ops *backend;
+	struct backends_list_entry *entry;
+
+	backend = talloc(talloc_autofree_context(), struct ldb_backend_ops);
+	if (!backend) return LDB_ERR_OPERATIONS_ERROR;
+
+	entry = talloc(talloc_autofree_context(), struct backends_list_entry);
+	if (!entry) {
+		talloc_free(backend);
+		return LDB_ERR_OPERATIONS_ERROR;
+	}
+
+	if (ldb_find_backend(url_prefix)) {
+		return LDB_SUCCESS;
+	}
+
+	/* Maybe check for duplicity here later on? */
+
+	backend->name = talloc_strdup(backend, url_prefix);
+	backend->connect_fn = connectfn;
+	entry->ops = backend;
+	DLIST_ADD(ldb_backends, entry);
+
+	return LDB_SUCCESS;
+}
+
+/*
+   Return the ldb module form of a database.
+   The URL can either be one of the following forms
+   ldb://path
+   ldapi://path
+
+   flags is made up of LDB_FLG_*
+
+   the options are passed uninterpreted to the backend, and are
+   backend specific.
+
+   This allows modules to get at only the backend module, for example where a
+   module may wish to direct certain requests at a particular backend.
+*/
+int ldb_connect_backend(struct ldb_context *ldb,
+			const char *url,
+			const char *options[],
+			struct ldb_module **backend_module)
+{
+	int ret;
+	char *backend;
+	ldb_connect_fn fn;
+
+	if (strchr(url, ':') != NULL) {
+		backend = talloc_strndup(ldb, url, strchr(url, ':')-url);
+	} else {
+		/* Default to tdb */
+		backend = talloc_strdup(ldb, "tdb");
+	}
+
+	fn = ldb_find_backend(backend);
+
+	if (fn == NULL) {
+		struct ldb_backend_ops *ops;
+		char *symbol_name = talloc_asprintf(ldb, "ldb_%s_backend_ops", backend);
+		if (symbol_name == NULL) {
+			return LDB_ERR_OPERATIONS_ERROR;
+		}
+		ops = ldb_dso_load_symbol(ldb, backend, symbol_name);
+		if (ops != NULL) {
+			fn = ops->connect_fn;
+		}
+		talloc_free(symbol_name);
+	}
+
+	talloc_free(backend);
+
+	if (fn == NULL) {
+		ldb_debug(ldb, LDB_DEBUG_FATAL,
+			  "Unable to find backend for '%s'\n", url);
+		return LDB_ERR_OTHER;
+	}
+
+	ret = fn(ldb, url, ldb->flags, options, backend_module);
+
+	if (ret != LDB_SUCCESS) {
+		ldb_debug(ldb, LDB_DEBUG_ERROR,
+			  "Failed to connect to '%s'\n", url);
+		return ret;
+	}
+	return ret;
+}
 
 static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
 {
 	struct ops_list_entry *e;
 	int i;
 
-	for (i = 0; builtin_modules[i]; i++) {
-		if (strcmp(builtin_modules[i]->name, name) == 0)
-			return builtin_modules[i];
+	for (i = 0; builtins[i].backend_ops || builtins[i].module_ops; i++) {
+		if (builtins[i].module_ops == NULL) continue;
+
+		if (strcmp(builtins[i].module_ops->name, name) == 0)
+			return builtins[i].module_ops;
 	}
  
 	for (e = registered_modules; e; e = e->next) {
@@ -441,3 +554,72 @@ int ldb_next_del_trans(struct ldb_module *module)
 	FIND_OP(module, del_transaction);
 	return module->ops->del_transaction(module);
 }
+
+#ifndef STATIC_LIBLDB_MODULES
+
+#ifdef HAVE_LDB_LDAP
+#define LDAP_BACKEND LDB_BACKEND(ldap), LDB_BACKEND(ldapi), LDB_BACKEND(ldaps),
+#else
+#define LDAP_BACKEND
+#endif
+
+#ifdef HAVE_LDB_SQLITE3
+#define SQLITE3_BACKEND LDB_BACKEND(sqlite3),
+#else
+#define SQLITE3_BACKEND
+#endif
+
+#define STATIC_LIBLDB_MODULES \
+	LDB_BACKEND(tdb),	\
+	LDAP_BACKEND	\
+	SQLITE3_BACKEND	\
+	LDB_MODULE(operational),	\
+	LDB_MODULE(rdn_name),	\
+	LDB_MODULE(paged_results),	\
+	LDB_MODULE(server_sort),		\
+	LDB_MODULE(asq), \
+	NULL
+#endif
+
+/*
+ * this is a bit hacked, as STATIC_LIBLDB_MODULES contains ','
+ * between the elements and we want to autogenerate the
+ * extern struct declarations, so we do some hacks and let the
+ * ',' appear in an unused function prototype.
+ */
+#undef NULL
+#define NULL LDB_MODULE(NULL),
+
+#define LDB_BACKEND(name) \
+	int); \
+	extern const struct ldb_backend_ops ldb_ ## name ## _backend_ops;\
+	extern void ldb_noop ## name (int
+#define LDB_MODULE(name) \
+	int); \
+	extern const struct ldb_module_ops ldb_ ## name ## _module_ops;\
+	extern void ldb_noop ## name (int
+
+extern void ldb_start_noop(int,
+STATIC_LIBLDB_MODULES
+int);
+
+#undef NULL
+#define NULL { \
+	.backend_ops = (void *)0, \
+	.module_ops = (void *)0 \
+}
+
+#undef LDB_BACKEND
+#define LDB_BACKEND(name) { \
+	.backend_ops = &ldb_ ## name ## _backend_ops, \
+	.module_ops = (void *)0 \
+}
+#undef LDB_MODULE
+#define LDB_MODULE(name) { \
+	.backend_ops = (void *)0, \
+	.module_ops = &ldb_ ## name ## _module_ops \
+}
+
+static const struct ldb_builtins builtins[] = {
+	STATIC_LIBLDB_MODULES
+};
-- 
cgit