s4-dsdb: convert the rest of the ldb modules to the new module type

40 files changed, 298 insertions, 77 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/acl.c b/source4/dsdb/samdb/ldb_modules/acl.c
index 3e302ef4ef..63e3f65b3a 100644
--- a/source4/dsdb/samdb/ldb_modules/acl.c
+++ b/source4/dsdb/samdb/ldb_modules/acl.c
@@ -1171,7 +1171,7 @@ static int acl_extended(struct ldb_module *module, struct ldb_request *req)
 	}
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_acl_module_ops = {
+static const struct ldb_module_ops ldb_acl_module_ops = {
 	.name		   = "acl",
 	.search            = acl_search,
 	.add               = acl_add,
@@ -1181,3 +1181,8 @@ _PUBLIC_ const struct ldb_module_ops ldb_acl_module_ops = {
 	.extended          = acl_extended,
 	.init_context	   = acl_module_init
 };
+
+int ldb_acl_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_acl_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/acl_read.c b/source4/dsdb/samdb/ldb_modules/acl_read.c
index bd9e1289f3..1bd9c5e18f 100644
--- a/source4/dsdb/samdb/ldb_modules/acl_read.c
+++ b/source4/dsdb/samdb/ldb_modules/acl_read.c
@@ -300,8 +300,13 @@ static int aclread_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_aclread_module_ops = {
+static const struct ldb_module_ops ldb_aclread_module_ops = {
 	.name		   = "aclread",
 	.search            = aclread_search,
 	.init_context      = aclread_init
 };
+
+int ldb_aclread_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_aclread_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/anr.c b/source4/dsdb/samdb/ldb_modules/anr.c
index ebe9d66097..9291dd5418 100644
--- a/source4/dsdb/samdb/ldb_modules/anr.c
+++ b/source4/dsdb/samdb/ldb_modules/anr.c
@@ -365,7 +365,12 @@ static int anr_search(struct ldb_module *module, struct ldb_request *req)
 	return ldb_next_request(module, down_req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_anr_module_ops = {
+static const struct ldb_module_ops ldb_anr_module_ops = {
 	.name		   = "anr",
 	.search = anr_search
 };
+
+int ldb_anr_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_anr_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index c94d6bdf0b..7aee406588 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -894,7 +894,7 @@ static int descriptor_init(struct ldb_module *module)
 }
 
 
-_PUBLIC_ const struct ldb_module_ops ldb_descriptor_module_ops = {
+static const struct ldb_module_ops ldb_descriptor_module_ops = {
 	.name	       = "descriptor",
 	.search        = descriptor_search,
 	.add           = descriptor_change,
@@ -902,3 +902,8 @@ _PUBLIC_ const struct ldb_module_ops ldb_descriptor_module_ops = {
 	.rename        = descriptor_rename,
 	.init_context  = descriptor_init
 };
+
+int ldb_descriptor_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_descriptor_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/dsdb_cache.c b/source4/dsdb/samdb/ldb_modules/dsdb_cache.c
index b7e4fca858..2a1b29d966 100644
--- a/source4/dsdb/samdb/ldb_modules/dsdb_cache.c
+++ b/source4/dsdb/samdb/ldb_modules/dsdb_cache.c
@@ -36,7 +36,12 @@ static int dsdb_cache_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_dsdb_cache_module_ops = {
+static const struct ldb_module_ops ldb_dsdb_cache_module_ops = {
 	.name		= "dsdb_cache",
 	.init_context	= dsdb_cache_init
 };
+
+int ldb_dsdb_cache_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_dsdb_cache_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
index 400c37faf2..60f6ec479f 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
@@ -404,10 +404,15 @@ static int extended_dn_in_rename(struct ldb_module *module, struct ldb_request *
 	return extended_dn_in_fix(module, req, req->op.rename.olddn);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_extended_dn_in_module_ops = {
+static const struct ldb_module_ops ldb_extended_dn_in_module_ops = {
 	.name		   = "extended_dn_in",
 	.search            = extended_dn_in_search,
 	.modify            = extended_dn_in_modify,
 	.del               = extended_dn_in_del,
 	.rename            = extended_dn_in_rename,
 };
+
+int ldb_extended_dn_in_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_extended_dn_in_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
index b44e595958..eab14edde2 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
@@ -880,7 +880,7 @@ static const struct ldb_module_ops ldb_extended_dn_out_fds_module_ops = {
 /*
   initialise the module
  */
-_PUBLIC_ int ldb_extended_dn_out_init(const char *ldb_version)
+_PUBLIC_ int ldb_extended_dn_out_module_init(const char *ldb_version)
 {
 	int ret;
 	ret = ldb_register_module(&ldb_extended_dn_out_ldb_module_ops);
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
index 73389440f5..471020dc89 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_store.c
@@ -448,8 +448,13 @@ static int extended_dn_modify(struct ldb_module *module, struct ldb_request *req
 	return ldb_next_request(module, ac->ops->search_req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_extended_dn_store_module_ops = {
+static const struct ldb_module_ops ldb_extended_dn_store_module_ops = {
 	.name		   = "extended_dn_store",
 	.add               = extended_dn_add,
 	.modify            = extended_dn_modify,
 };
+
+int ldb_extended_dn_store_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_extended_dn_store_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/instancetype.c b/source4/dsdb/samdb/ldb_modules/instancetype.c
index a728502449..73741037f3 100644
--- a/source4/dsdb/samdb/ldb_modules/instancetype.c
+++ b/source4/dsdb/samdb/ldb_modules/instancetype.c
@@ -196,8 +196,13 @@ static int instancetype_mod(struct ldb_module *module, struct ldb_request *req)
 	return ldb_next_request(module, req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_instancetype_module_ops = {
+static const struct ldb_module_ops ldb_instancetype_module_ops = {
 	.name          = "instancetype",
 	.add           = instancetype_add,
 	.modify        = instancetype_mod
 };
+
+int ldb_instancetype_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_instancetype_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/lazy_commit.c b/source4/dsdb/samdb/ldb_modules/lazy_commit.c
index b46f88a575..d0efea257e 100644
--- a/source4/dsdb/samdb/ldb_modules/lazy_commit.c
+++ b/source4/dsdb/samdb/ldb_modules/lazy_commit.c
@@ -109,7 +109,7 @@ static int unlazy_op(struct ldb_module *module, struct ldb_request *req)
 	return ldb_next_request(module, new_req);
 }
 
-const struct ldb_module_ops ldb_lazy_commit_module_ops = {
+static const struct ldb_module_ops ldb_lazy_commit_module_ops = {
 	.name		   = "lazy_commit",
 	.search            = unlazy_op,
 	.add               = unlazy_op,
@@ -119,3 +119,8 @@ const struct ldb_module_ops ldb_lazy_commit_module_ops = {
 	.request      	   = unlazy_op,
 	.extended          = unlazy_op,
 };
+
+int ldb_lazy_commit_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_lazy_commit_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/linked_attributes.c b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
index 25596f020f..18faa73217 100644
--- a/source4/dsdb/samdb/ldb_modules/linked_attributes.c
+++ b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
@@ -1078,7 +1078,7 @@ static int linked_attributes_del_transaction(struct ldb_module *module)
 }
 
 
-_PUBLIC_ const struct ldb_module_ops ldb_linked_attributes_module_ops = {
+static const struct ldb_module_ops ldb_linked_attributes_module_ops = {
 	.name		   = "linked_attributes",
 	.add               = linked_attributes_add,
 	.modify            = linked_attributes_modify,
@@ -1087,3 +1087,8 @@ _PUBLIC_ const struct ldb_module_ops ldb_linked_attributes_module_ops = {
 	.prepare_commit    = linked_attributes_prepare_commit,
 	.del_transaction   = linked_attributes_del_transaction,
 };
+
+int ldb_linked_attributes_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_linked_attributes_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/local_password.c b/source4/dsdb/samdb/ldb_modules/local_password.c
index 1a7b19d442..ed267e55e1 100644
--- a/source4/dsdb/samdb/ldb_modules/local_password.c
+++ b/source4/dsdb/samdb/ldb_modules/local_password.c
@@ -1098,10 +1098,15 @@ static int local_password_search(struct ldb_module *module, struct ldb_request *
 	return ldb_next_request(module, remote_req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_local_password_module_ops = {
+static const struct ldb_module_ops ldb_local_password_module_ops = {
 	.name          = "local_password",
 	.add           = local_password_add,
 	.modify        = local_password_modify,
 	.del           = local_password_delete,
 	.search        = local_password_search
 };
+
+int ldb_local_password_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_local_password_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/naming_fsmo.c b/source4/dsdb/samdb/ldb_modules/naming_fsmo.c
index 3e45c2e647..4b30cfe1cc 100644
--- a/source4/dsdb/samdb/ldb_modules/naming_fsmo.c
+++ b/source4/dsdb/samdb/ldb_modules/naming_fsmo.c
@@ -96,7 +96,12 @@ static int naming_fsmo_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_naming_fsmo_module_ops = {
+static const struct ldb_module_ops ldb_naming_fsmo_module_ops = {
 	.name		= "naming_fsmo",
 	.init_context	= naming_fsmo_init
 };
+
+int ldb_naming_fsmo_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_naming_fsmo_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/new_partition.c b/source4/dsdb/samdb/ldb_modules/new_partition.c
index 8e63eac40c..0c5082bf14 100644
--- a/source4/dsdb/samdb/ldb_modules/new_partition.c
+++ b/source4/dsdb/samdb/ldb_modules/new_partition.c
@@ -195,7 +195,12 @@ static int new_partition_add(struct ldb_module *module, struct ldb_request *req)
 	return ldb_next_request(module, req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_new_partition_module_ops = {
+static const struct ldb_module_ops ldb_new_partition_module_ops = {
 	.name          = "new_partition",
 	.add           = new_partition_add,
 };
+
+int ldb_new_partition_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_new_partition_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index c389965acc..d58cf53233 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -1508,7 +1508,7 @@ static int objectclass_init(struct ldb_module *module)
 	return ret;
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_objectclass_module_ops = {
+static const struct ldb_module_ops ldb_objectclass_module_ops = {
 	.name		= "objectclass",
 	.add		= objectclass_add,
 	.modify		= objectclass_modify,
@@ -1516,3 +1516,8 @@ _PUBLIC_ const struct ldb_module_ops ldb_objectclass_module_ops = {
 	.del		= objectclass_delete,
 	.init_context	= objectclass_init
 };
+
+int ldb_objectclass_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_objectclass_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c
index 5d3f51fbf5..abc64be9e9 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c
@@ -466,8 +466,13 @@ static int objectclass_attrs_modify(struct ldb_module *module,
 	return attr_handler(ac);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_objectclass_attrs_module_ops = {
+static const struct ldb_module_ops ldb_objectclass_attrs_module_ops = {
 	.name		   = "objectclass_attrs",
 	.add               = objectclass_attrs_add,
 	.modify            = objectclass_attrs_modify
 };
+
+int ldb_objectclass_attrs_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_objectclass_attrs_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/objectguid.c b/source4/dsdb/samdb/ldb_modules/objectguid.c
index d7dc885003..24103bdada 100644
--- a/source4/dsdb/samdb/ldb_modules/objectguid.c
+++ b/source4/dsdb/samdb/ldb_modules/objectguid.c
@@ -275,8 +275,13 @@ static int objectguid_modify(struct ldb_module *module, struct ldb_request *req)
 	return ldb_next_request(module, down_req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_objectguid_module_ops = {
+static const struct ldb_module_ops ldb_objectguid_module_ops = {
 	.name          = "objectguid",
 	.add           = objectguid_add,
 	.modify        = objectguid_modify,
 };
+
+int ldb_objectguid_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_objectguid_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 65ac36a97a..ed4ce651c2 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -859,8 +859,13 @@ static int operational_init(struct ldb_module *ctx)
 	return LDB_SUCCESS;
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_operational_module_ops = {
+static const struct ldb_module_ops ldb_operational_module_ops = {
 	.name              = "operational",
 	.search            = operational_search,
 	.init_context	   = operational_init
 };
+
+int ldb_operational_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_operational_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 68f31bce36..aecc27f4da 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -1195,7 +1195,7 @@ static int partition_extended(struct ldb_module *module, struct ldb_request *req
 	return partition_send_all(module, ac, req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_partition_module_ops = {
+static const struct ldb_module_ops ldb_partition_module_ops = {
 	.name		   = "partition",
 	.init_context	   = partition_init,
 	.search            = partition_search,
@@ -1209,3 +1209,8 @@ _PUBLIC_ const struct ldb_module_ops ldb_partition_module_ops = {
 	.end_transaction   = partition_end_trans,
 	.del_transaction   = partition_del_trans,
 };
+
+int ldb_partition_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_partition_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index c9748af698..41be2f6d7e 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -2817,8 +2817,13 @@ static int password_hash_mod_do_mod(struct ph_context *ac)
 	return ldb_next_request(ac->module, mod_req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_password_hash_module_ops = {
+static const struct ldb_module_ops ldb_password_hash_module_ops = {
 	.name          = "password_hash",
 	.add           = password_hash_add,
 	.modify        = password_hash_modify
 };
+
+int ldb_password_hash_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_password_hash_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c b/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c
index d5ff1dcde5..63800d17e4 100644
--- a/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c
+++ b/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c
@@ -101,7 +101,12 @@ static int pdc_fsmo_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_pdc_fsmo_module_ops = {
+static const struct ldb_module_ops ldb_pdc_fsmo_module_ops = {
 	.name		= "pdc_fsmo",
 	.init_context	= pdc_fsmo_init
 };
+
+int ldb_pdc_fsmo_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_pdc_fsmo_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 1625fdf96b..4a73fe9c35 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -394,7 +394,12 @@ static int proxy_request(struct ldb_module *module, struct ldb_request *req)
 	}
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_proxy_module_ops = {
+static const struct ldb_module_ops ldb_proxy_module_ops = {
 	.name		= "proxy",
 	.request	= proxy_request
 };
+
+int ldb_proxy_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_proxy_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/ranged_results.c b/source4/dsdb/samdb/ldb_modules/ranged_results.c
index 3f1e09fbb6..e1ab18e313 100644
--- a/source4/dsdb/samdb/ldb_modules/ranged_results.c
+++ b/source4/dsdb/samdb/ldb_modules/ranged_results.c
@@ -246,7 +246,12 @@ static int rr_search(struct ldb_module *module, struct ldb_request *req)
 	return ldb_next_request(module, req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_ranged_results_module_ops = {
+static const struct ldb_module_ops ldb_ranged_results_module_ops = {
 	.name		   = "ranged_results",
 	.search            = rr_search,
 };
+
+int ldb_ranged_results_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_ranged_results_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 1eb4745987..1086166f28 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -4195,7 +4195,7 @@ static int replmd_del_transaction(struct ldb_module *module)
 }
 
 
-_PUBLIC_ const struct ldb_module_ops ldb_repl_meta_data_module_ops = {
+static const struct ldb_module_ops ldb_repl_meta_data_module_ops = {
 	.name          = "repl_meta_data",
 	.init_context	   = replmd_init,
 	.add               = replmd_add,
@@ -4207,3 +4207,8 @@ _PUBLIC_ const struct ldb_module_ops ldb_repl_meta_data_module_ops = {
 	.prepare_commit    = replmd_prepare_commit,
 	.del_transaction   = replmd_del_transaction,
 };
+
+int ldb_repl_meta_data_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_repl_meta_data_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/resolve_oids.c b/source4/dsdb/samdb/ldb_modules/resolve_oids.c
index 10adcb90de..19d7454178 100644
--- a/source4/dsdb/samdb/ldb_modules/resolve_oids.c
+++ b/source4/dsdb/samdb/ldb_modules/resolve_oids.c
@@ -691,10 +691,15 @@ static int resolve_oids_modify(struct ldb_module *module, struct ldb_request *re
 	return ldb_next_request(module, down_req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_resolve_oids_module_ops = {
+static const struct ldb_module_ops ldb_resolve_oids_module_ops = {
 	.name		= "resolve_oids",
 	.search		= resolve_oids_search,
 	.add		= resolve_oids_add,
 	.modify		= resolve_oids_modify,
 };
 
+
+int ldb_resolve_oids_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_resolve_oids_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index b986f77871..8eadb323ac 100644
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -1226,7 +1226,7 @@ static int rootdse_delete(struct ldb_module *module, struct ldb_request *req)
 	return LDB_ERR_NO_SUCH_OBJECT;
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_rootdse_module_ops = {
+static const struct ldb_module_ops ldb_rootdse_module_ops = {
 	.name		= "rootdse",
 	.init_context   = rootdse_init,
 	.search         = rootdse_search,
@@ -1235,3 +1235,8 @@ _PUBLIC_ const struct ldb_module_ops ldb_rootdse_module_ops = {
 	.modify         = rootdse_modify,
 	.del		= rootdse_delete
 };
+
+int ldb_rootdse_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_rootdse_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c
index 7faa9359db..54212526be 100644
--- a/source4/dsdb/samdb/ldb_modules/samba3sam.c
+++ b/source4/dsdb/samdb/ldb_modules/samba3sam.c
@@ -923,8 +923,13 @@ static int samba3sam_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_samba3sam_module_ops = {
+static const struct ldb_module_ops ldb_samba3sam_module_ops = {
 	LDB_MAP_OPS
 	.name		   = "samba3sam",
 	.init_context	   = samba3sam_init,
 };
+
+int ldb_samba3sam_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_samba3sam_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/samba3sid.c b/source4/dsdb/samdb/ldb_modules/samba3sid.c
index f6db0d1948..3fb4e98268 100644
--- a/source4/dsdb/samdb/ldb_modules/samba3sid.c
+++ b/source4/dsdb/samdb/ldb_modules/samba3sid.c
@@ -192,8 +192,13 @@ static int samba3sid_add(struct ldb_module *module, struct ldb_request *req)
 	return ldb_next_request(module, new_req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_samba3sid_module_ops = {
+static const struct ldb_module_ops ldb_samba3sid_module_ops = {
 	.name          = "samba3sid",
 	.add           = samba3sid_add,
 };
 
+
+int ldb_samba3sid_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_samba3sid_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
index 9536981393..871a5bd071 100644
--- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
@@ -352,7 +352,12 @@ static int samba_dsdb_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_samba_dsdb_module_ops = {
+static const struct ldb_module_ops ldb_samba_dsdb_module_ops = {
 	.name		   = "samba_dsdb",
 	.init_context	   = samba_dsdb_init,
 };
+
+int ldb_samba_dsdb_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_samba_dsdb_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/samba_secrets.c b/source4/dsdb/samdb/ldb_modules/samba_secrets.c
index d64220fb24..8a0faae8c1 100644
--- a/source4/dsdb/samdb/ldb_modules/samba_secrets.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_secrets.c
@@ -92,7 +92,12 @@ static int samba_secrets_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_samba_secrets_module_ops = {
+static const struct ldb_module_ops ldb_samba_secrets_module_ops = {
 	.name		   = "samba_secrets",
 	.init_context	   = samba_secrets_init,
 };
+
+int ldb_samba_secrets_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_samba_secrets_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index b91ca3e83b..2b3129cd99 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -1983,7 +1983,7 @@ static int samldb_extended(struct ldb_module *module, struct ldb_request *req)
 }
 
 
-_PUBLIC_ const struct ldb_module_ops ldb_samldb_module_ops = {
+static const struct ldb_module_ops ldb_samldb_module_ops = {
 	.name          = "samldb",
 	.add           = samldb_add,
 	.modify        = samldb_modify,
@@ -1991,3 +1991,8 @@ _PUBLIC_ const struct ldb_module_ops ldb_samldb_module_ops = {
 	.extended      = samldb_extended
 };
 
+
+int ldb_samldb_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_samldb_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/schema_data.c b/source4/dsdb/samdb/ldb_modules/schema_data.c
index 4818a54dcf..0f52e4793c 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_data.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_data.c
@@ -476,9 +476,14 @@ static int schema_data_search(struct ldb_module *module, struct ldb_request *req
 }
 
 
-_PUBLIC_ const struct ldb_module_ops ldb_schema_data_module_ops = {
+static const struct ldb_module_ops ldb_schema_data_module_ops = {
 	.name		= "schema_data",
 	.init_context	= schema_data_init,
 	.add		= schema_data_add,
 	.search         = schema_data_search
 };
+
+int ldb_schema_data_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_schema_data_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/schema_load.c b/source4/dsdb/samdb/ldb_modules/schema_load.c
index 175fe9367d..a02d72878e 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_load.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_load.c
@@ -354,7 +354,7 @@ static int schema_load_extended(struct ldb_module *module, struct ldb_request *r
 }
 
 
-_PUBLIC_ const struct ldb_module_ops ldb_schema_load_module_ops = {
+static const struct ldb_module_ops ldb_schema_load_module_ops = {
 	.name		= "schema_load",
 	.init_context	= schema_load_init,
 	.extended	= schema_load_extended,
@@ -362,3 +362,8 @@ _PUBLIC_ const struct ldb_module_ops ldb_schema_load_module_ops = {
 	.prepare_commit    = schema_load_prepare_commit,
 	.del_transaction   = schema_load_del_transaction,
 };
+
+int ldb_schema_load_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_schema_load_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/show_deleted.c b/source4/dsdb/samdb/ldb_modules/show_deleted.c
index 5c5d726d86..6dc1d7398f 100644
--- a/source4/dsdb/samdb/ldb_modules/show_deleted.c
+++ b/source4/dsdb/samdb/ldb_modules/show_deleted.c
@@ -164,8 +164,13 @@ static int show_deleted_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_show_deleted_module_ops = {
+static const struct ldb_module_ops ldb_show_deleted_module_ops = {
 	.name		   = "show_deleted",
 	.search            = show_deleted_search,
 	.init_context	   = show_deleted_init
 };
+
+int ldb_show_deleted_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_show_deleted_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/simple_dn.c b/source4/dsdb/samdb/ldb_modules/simple_dn.c
index d863290a03..5b30ea9967 100644
--- a/source4/dsdb/samdb/ldb_modules/simple_dn.c
+++ b/source4/dsdb/samdb/ldb_modules/simple_dn.c
@@ -67,7 +67,12 @@ static int simple_dn_search(struct ldb_module *module, struct ldb_request *req)
 	return ldb_next_request(module, down_req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_simple_dn_module_ops = {
+static const struct ldb_module_ops ldb_simple_dn_module_ops = {
 	.name		   = "simple_dn",
 	.search = simple_dn_search
 };
+
+int ldb_simple_dn_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_simple_dn_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
index cee952126d..5d09bda081 100644
--- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -937,7 +937,7 @@ static const struct ldb_module_ops ldb_nsuniqueid_module_ops = {
 /*
   initialise the module
  */
-_PUBLIC_ int ldb_simple_ldap_map_init(const char *ldb_version)
+_PUBLIC_ int ldb_simple_ldap_map_module_init(const char *ldb_version)
 {
 	int ret;
 	ret = ldb_register_module(&ldb_entryuuid_module_ops);
diff --git a/source4/dsdb/samdb/ldb_modules/subtree_delete.c b/source4/dsdb/samdb/ldb_modules/subtree_delete.c
index 91d22c984e..aa03ab26b6 100644
--- a/source4/dsdb/samdb/ldb_modules/subtree_delete.c
+++ b/source4/dsdb/samdb/ldb_modules/subtree_delete.c
@@ -110,8 +110,13 @@ static int subtree_delete_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_subtree_delete_module_ops = {
+static const struct ldb_module_ops ldb_subtree_delete_module_ops = {
 	.name		   = "subtree_delete",
 	.init_context      = subtree_delete_init,
 	.del               = subtree_delete
 };
+
+int ldb_subtree_delete_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_subtree_delete_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/subtree_rename.c b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
index f6b3625678..ce444f8378 100644
--- a/source4/dsdb/samdb/ldb_modules/subtree_rename.c
+++ b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
@@ -444,7 +444,12 @@ static int subtree_rename(struct ldb_module *module, struct ldb_request *req)
 	return ldb_next_request(module, search_req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_subtree_rename_module_ops = {
+static const struct ldb_module_ops ldb_subtree_rename_module_ops = {
 	.name		   = "subtree_rename",
 	.rename            = subtree_rename
 };
+
+int ldb_subtree_rename_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_subtree_rename_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c
index 75c96fc579..2bb949a207 100644
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -433,7 +433,7 @@ static int update_kt_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_update_keytab_module_ops = {
+static const struct ldb_module_ops ldb_update_keytab_module_ops = {
 	.name		   = "update_keytab",
 	.init_context	   = update_kt_init,
 	.add               = update_kt_add,
@@ -443,3 +443,8 @@ _PUBLIC_ const struct ldb_module_ops ldb_update_keytab_module_ops = {
 	.prepare_commit    = update_kt_prepare_commit,
 	.del_transaction   = update_kt_del_trans,
 };
+
+int ldb_update_keytab_module_init(const char *version)
+{
+	return ldb_register_module(&ldb_update_keytab_module_ops);
+}
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 4bf89d294b..4fe807fabc 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -27,7 +27,8 @@ bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_SCHEMA',
 bld.SAMBA_MODULE('ldb_samba_dsdb',
 	source='samba_dsdb.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(samba_dsdb)',
+	init_function='ldb_samba_dsdb_module_init',
+        module_init_name='ldb_init_module',
 	deps='SAMDB talloc events ndr DSDB_MODULE_HELPERS',
 	internal_module=False,
 	)
@@ -36,7 +37,8 @@ bld.SAMBA_MODULE('ldb_samba_dsdb',
 bld.SAMBA_MODULE('ldb_samba_secrets',
 	source='samba_secrets.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(samba_secrets)',
+	init_function='ldb_samba_secrets_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='SAMDB talloc events ndr'
 	)
@@ -45,7 +47,8 @@ bld.SAMBA_MODULE('ldb_samba_secrets',
 bld.SAMBA_MODULE('ldb_objectguid',
 	source='objectguid.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(objectguid)',
+	init_function='ldb_objectguid_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='SAMDB talloc events ndr'
 	)
@@ -54,7 +57,8 @@ bld.SAMBA_MODULE('ldb_objectguid',
 bld.SAMBA_MODULE('ldb_repl_meta_data',
 	source='repl_meta_data.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(repl_meta_data)',
+	init_function='ldb_repl_meta_data_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='SAMDB talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security-session'
 	)
@@ -63,7 +67,8 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
 bld.SAMBA_MODULE('ldb_dsdb_cache',
 	source='dsdb_cache.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(dsdb_cache)',
+	init_function='ldb_dsdb_cache_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='SAMDB talloc events'
 	)
@@ -72,7 +77,8 @@ bld.SAMBA_MODULE('ldb_dsdb_cache',
 bld.SAMBA_MODULE('ldb_schema_load',
 	source='schema_load.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(schema_load)',
+	init_function='ldb_schema_load_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='SAMDB talloc events DSDB_MODULE_HELPERS'
 	)
@@ -81,7 +87,8 @@ bld.SAMBA_MODULE('ldb_schema_load',
 bld.SAMBA_MODULE('ldb_schema_data',
 	source='schema_data.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(schema_data)',
+	init_function='ldb_schema_data_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='SAMDB talloc events DSDB_MODULE_HELPERS'
 	)
@@ -90,7 +97,8 @@ bld.SAMBA_MODULE('ldb_schema_data',
 bld.SAMBA_MODULE('ldb_naming_fsmo',
 	source='naming_fsmo.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(naming_fsmo)',
+	init_function='ldb_naming_fsmo_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='SAMDB talloc events DSDB_MODULE_HELPERS'
 	)
@@ -99,7 +107,8 @@ bld.SAMBA_MODULE('ldb_naming_fsmo',
 bld.SAMBA_MODULE('ldb_pdc_fsmo',
 	source='pdc_fsmo.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(pdc_fsmo)',
+	init_function='ldb_pdc_fsmo_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='SAMDB talloc events DSDB_MODULE_HELPERS'
 	)
@@ -108,7 +117,8 @@ bld.SAMBA_MODULE('ldb_pdc_fsmo',
 bld.SAMBA_MODULE('ldb_samldb',
 	source='samldb.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(samldb)',
+	init_function='ldb_samldb_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC'
 	)
@@ -117,7 +127,8 @@ bld.SAMBA_MODULE('ldb_samldb',
 bld.SAMBA_MODULE('ldb_samba3sam',
 	source='samba3sam.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(samba3sam)',
+	init_function='ldb_samba3sam_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events ldb smbpasswd security NDR_SECURITY'
 	)
@@ -126,7 +137,8 @@ bld.SAMBA_MODULE('ldb_samba3sam',
 bld.SAMBA_MODULE('ldb_samba3sid',
 	source='samba3sid.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(samba3sid)',
+	init_function='ldb_samba3sid_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events ldb security NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'
 	)
@@ -135,7 +147,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
 bld.SAMBA_MODULE('ldb_simple_ldap_map',
                  source='simple_ldap_map.c',
                  subsystem='ldb',
-                 init_function='ldb_simple_ldap_map_init',
+                 init_function='ldb_simple_ldap_map_module_init',
                  module_init_name='ldb_init_module',
                  internal_module=False,
                  deps='talloc events ldb ndr LDBSAMBA'
@@ -145,7 +157,8 @@ bld.SAMBA_MODULE('ldb_simple_ldap_map',
 bld.SAMBA_MODULE('ldb_rootdse',
 	source='rootdse.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(rootdse)',
+	init_function='ldb_rootdse_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events SAMDB MESSAGING security-session DSDB_MODULE_HELPERS'
 	)
@@ -154,7 +167,8 @@ bld.SAMBA_MODULE('ldb_rootdse',
 bld.SAMBA_MODULE('ldb_password_hash',
 	source='password_hash.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(password_hash)',
+	init_function='ldb_password_hash_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events SAMDB LIBCLI_AUTH NDR_DRSBLOBS authkrb5 hdb krb5 com_err'
 	)
@@ -163,7 +177,8 @@ bld.SAMBA_MODULE('ldb_password_hash',
 bld.SAMBA_MODULE('ldb_local_password',
 	source='local_password.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(local_password)',
+	init_function='ldb_local_password_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events ndr SAMDB'
 	)
@@ -171,7 +186,8 @@ bld.SAMBA_MODULE('ldb_local_password',
 bld.SAMBA_MODULE('ldb_extended_dn_in',
 	source='extended_dn_in.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(extended_dn_in)',
+	init_function='ldb_extended_dn_in_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events samba-util'
 	)
@@ -179,7 +195,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_in',
 
 bld.SAMBA_MODULE('ldb_extended_dn_out',
                  source='extended_dn_out.c',
-                 init_function='ldb_extended_dn_out_init',
+                 init_function='ldb_extended_dn_out_module_init',
                  module_init_name='ldb_init_module',
                  subsystem='ldb',
                  deps='talloc events ndr samba-util SAMDB',
@@ -190,7 +206,8 @@ bld.SAMBA_MODULE('ldb_extended_dn_out',
 bld.SAMBA_MODULE('ldb_extended_dn_store',
 	source='extended_dn_store.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(extended_dn_store)',
+	init_function='ldb_extended_dn_store_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events samba-util SAMDB DSDB_MODULE_HELPERS'
 	)
@@ -199,7 +216,8 @@ bld.SAMBA_MODULE('ldb_extended_dn_store',
 bld.SAMBA_MODULE('ldb_show_deleted',
 	source='show_deleted.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(show_deleted)',
+	init_function='ldb_show_deleted_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events samba-util DSDB_MODULE_HELPERS'
 	)
@@ -209,7 +227,8 @@ bld.SAMBA_MODULE('ldb_partition',
 	source='partition.c partition_init.c',
 	autoproto='partition_proto.h',
 	subsystem='ldb',
-	init_function='LDB_MODULE(partition)',
+	init_function='ldb_partition_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events SAMDB DSDB_MODULE_HELPERS'
 	)
@@ -218,7 +237,8 @@ bld.SAMBA_MODULE('ldb_partition',
 bld.SAMBA_MODULE('ldb_new_partition',
 	source='new_partition.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(new_partition)',
+	init_function='ldb_new_partition_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events SAMDB DSDB_MODULE_HELPERS'
 	)
@@ -227,7 +247,8 @@ bld.SAMBA_MODULE('ldb_new_partition',
 bld.SAMBA_MODULE('ldb_update_keytab',
 	source='update_keytab.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(update_keytab)',
+	init_function='ldb_update_keytab_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events CREDENTIALS ldb com_err KERBEROS_UTIL'
 	)
@@ -236,7 +257,8 @@ bld.SAMBA_MODULE('ldb_update_keytab',
 bld.SAMBA_MODULE('ldb_objectclass',
 	source='objectclass.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(objectclass)',
+	init_function='ldb_objectclass_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS samba-util DSDB_MODULE_HELPER_SCHEMA'
 	)
@@ -245,7 +267,8 @@ bld.SAMBA_MODULE('ldb_objectclass',
 bld.SAMBA_MODULE('ldb_objectclass_attrs',
 	source='objectclass_attrs.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(objectclass_attrs)',
+	init_function='ldb_objectclass_attrs_module_init',
+        module_init_name='ldb_init_module',
 	deps='talloc SAMDB samba-util',
 	internal_module=False,
 	)
@@ -254,7 +277,8 @@ bld.SAMBA_MODULE('ldb_objectclass_attrs',
 bld.SAMBA_MODULE('ldb_subtree_rename',
 	source='subtree_rename.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(subtree_rename)',
+	init_function='ldb_subtree_rename_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events samba-util ldb samdb-common'
 	)
@@ -263,7 +287,8 @@ bld.SAMBA_MODULE('ldb_subtree_rename',
 bld.SAMBA_MODULE('ldb_subtree_delete',
 	source='subtree_delete.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(subtree_delete)',
+	init_function='ldb_subtree_delete_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events samba-util DSDB_MODULE_HELPERS'
 	)
@@ -272,7 +297,8 @@ bld.SAMBA_MODULE('ldb_subtree_delete',
 bld.SAMBA_MODULE('ldb_linked_attributes',
 	source='linked_attributes.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(linked_attributes)',
+	init_function='ldb_linked_attributes_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events SAMDB DSDB_MODULE_HELPERS'
 	)
@@ -281,7 +307,8 @@ bld.SAMBA_MODULE('ldb_linked_attributes',
 bld.SAMBA_MODULE('ldb_ranged_results',
 	source='ranged_results.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(ranged_results)',
+	init_function='ldb_ranged_results_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events samba-util ldb'
 	)
@@ -290,7 +317,8 @@ bld.SAMBA_MODULE('ldb_ranged_results',
 bld.SAMBA_MODULE('ldb_anr',
 	source='anr.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(anr)',
+	init_function='ldb_anr_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events samba-util SAMDB'
 	)
@@ -299,7 +327,8 @@ bld.SAMBA_MODULE('ldb_anr',
 bld.SAMBA_MODULE('ldb_instancetype',
 	source='instancetype.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(instancetype)',
+	init_function='ldb_instancetype_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events samba-util SAMDB DSDB_MODULE_HELPERS'
 	)
@@ -308,7 +337,8 @@ bld.SAMBA_MODULE('ldb_instancetype',
 bld.SAMBA_MODULE('ldb_operational',
 	source='operational.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(operational)',
+	init_function='ldb_operational_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc tevent samba-util samdb-common DSDB_MODULE_HELPERS auth SAMDB'
 	)
@@ -317,7 +347,8 @@ bld.SAMBA_MODULE('ldb_operational',
 bld.SAMBA_MODULE('ldb_descriptor',
 	source='descriptor.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(descriptor)',
+	init_function='ldb_descriptor_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
 	)
@@ -326,7 +357,8 @@ bld.SAMBA_MODULE('ldb_descriptor',
 bld.SAMBA_MODULE('ldb_resolve_oids',
 	source='resolve_oids.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(resolve_oids)',
+	init_function='ldb_resolve_oids_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='SAMDB talloc events ndr'
 	)
@@ -335,7 +367,8 @@ bld.SAMBA_MODULE('ldb_resolve_oids',
 bld.SAMBA_MODULE('ldb_acl',
 	source='acl.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(acl)',
+	init_function='ldb_acl_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events security SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
 	)
@@ -345,14 +378,16 @@ bld.SAMBA_MODULE('ldb_lazy_commit',
 	source='lazy_commit.c',
 	subsystem='ldb',
 	internal_module=False,
-	init_function='LDB_MODULE(lazy_commit)',
+        module_init_name='ldb_init_module',
+	init_function='ldb_lazy_commit_module_init',
 	deps='SAMDB DSDB_MODULE_HELPERS'
 	)
 
 bld.SAMBA_MODULE('ldb_aclread',
 	source='acl_read.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(aclread)',
+	init_function='ldb_aclread_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc events security SAMDB DSDB_MODULE_HELPERS',
 	)
@@ -360,7 +395,8 @@ bld.SAMBA_MODULE('ldb_aclread',
 bld.SAMBA_MODULE('ldb_simple_dn',
 	source='simple_dn.c',
 	subsystem='ldb',
-	init_function='LDB_MODULE(simple_dn)',
+	init_function='ldb_simple_dn_module_init',
+        module_init_name='ldb_init_module',
 	internal_module=False,
 	deps='talloc DSDB_MODULE_HELPERS'
 	)