s4-ldb: convert the rest of the ldb modules to the new style

6 files changed, 36 insertions, 6 deletions

diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c
index 6d1e88b67b..45a733bd13 100644
--- a/source4/lib/ldb/modules/asq.c
+++ b/source4/lib/ldb/modules/asq.c
@@ -400,8 +400,13 @@ static int asq_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-const struct ldb_module_ops ldb_asq_module_ops = {
+static const struct ldb_module_ops ldb_asq_module_ops = {
 	.name		   = "asq",
 	.search		   = asq_search,
 	.init_context	   = asq_init
 };
+
+int ldb_asq_init(const char *ldb_version)
+{
+	return ldb_register_module(&ldb_asq_module_ops);
+}
diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c
index 25b7532612..f61dd9698d 100644
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/source4/lib/ldb/modules/paged_results.c
@@ -423,8 +423,13 @@ static int paged_request_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-const struct ldb_module_ops ldb_paged_results_module_ops = {
+static const struct ldb_module_ops ldb_paged_results_module_ops = {
 	.name           = "paged_results",
 	.search         = paged_search,
 	.init_context 	= paged_request_init
 };
+
+int ldb_paged_results_init(const char *version)
+{
+	return ldb_register_module(&ldb_paged_results_module_ops);
+}
diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c
index bd2ea0942e..becab83bcf 100644
--- a/source4/lib/ldb/modules/paged_searches.c
+++ b/source4/lib/ldb/modules/paged_searches.c
@@ -371,8 +371,13 @@ static int ps_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_paged_searches_module_ops = {
+static const struct ldb_module_ops ldb_paged_searches_module_ops = {
 	.name           = "paged_searches",
 	.search         = ps_search,
 	.init_context 	= ps_init
 };
+
+int ldb_paged_searches_init(const char *version)
+{
+	return ldb_register_module(&ldb_paged_searches_module_ops);
+}
diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c
index a0867c0f51..caff9f59e2 100644
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -377,9 +377,14 @@ static int rdn_name_modify(struct ldb_module *module, struct ldb_request *req)
 	return ldb_next_request(module, req);
 }
 
-const struct ldb_module_ops ldb_rdn_name_module_ops = {
+static const struct ldb_module_ops ldb_rdn_name_module_ops = {
 	.name              = "rdn_name",
 	.add               = rdn_name_add,
 	.modify            = rdn_name_modify,
 	.rename            = rdn_name_rename
 };
+
+int ldb_rdn_name_init(const char *version)
+{
+	return ldb_register_module(&ldb_rdn_name_module_ops);
+}
diff --git a/source4/lib/ldb/modules/skel.c b/source4/lib/ldb/modules/skel.c
index 248f9b346b..5dee735c60 100644
--- a/source4/lib/ldb/modules/skel.c
+++ b/source4/lib/ldb/modules/skel.c
@@ -123,7 +123,7 @@ static int skel_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-const struct ldb_module_ops ldb_skel_module_ops = {
+static const struct ldb_module_ops ldb_skel_module_ops = {
 	.name		   = "skel",
 	.init_context	   = skel_init,
 	.search            = skel_search,
@@ -136,3 +136,8 @@ const struct ldb_module_ops ldb_skel_module_ops = {
 	.end_transaction   = skel_end_trans,
 	.del_transaction   = skel_del_trans,
 };
+
+int ldb_skel_init(const char *version)
+{
+	return ldb_register_module(&ldb_skel_module_ops);
+}
diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c
index f7c381f163..fd30c90505 100644
--- a/source4/lib/ldb/modules/sort.c
+++ b/source4/lib/ldb/modules/sort.c
@@ -344,8 +344,13 @@ static int server_sort_init(struct ldb_module *module)
 	return ldb_next_init(module);
 }
 
-const struct ldb_module_ops ldb_server_sort_module_ops = {
+static const struct ldb_module_ops ldb_server_sort_module_ops = {
 	.name		   = "server_sort",
 	.search            = server_sort_search,
 	.init_context	   = server_sort_init
 };
+
+int ldb_server_sort_init(const char *version)
+{
+	return ldb_register_module(&ldb_server_sort_module_ops);
+}