lib/util Rename samba_init_module_fns_run -> samba_module_init_fns_run

This is to provide a cleaner namespace in the public samba plugin
functions.

Andrew Bartlett

13 files changed, 21 insertions, 21 deletions

diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index 78141334bfe..def4af33ed3 100644
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -889,8 +889,8 @@ _PUBLIC_ NTSTATUS gensec_init(void)
 
 	shared_init = samba_modules_load(NULL, "gensec");
 
-	samba_init_module_fns_run(static_init);
-	samba_init_module_fns_run(shared_init);
+	samba_module_init_fns_run(static_init);
+	samba_module_init_fns_run(shared_init);
 
 	talloc_free(shared_init);
 
diff --git a/lib/util/samba_module.c b/lib/util/samba_module.c
index fd3da7552e1..6dc42eaf088 100644
--- a/lib/util/samba_module.c
+++ b/lib/util/samba_module.c
@@ -30,7 +30,7 @@
  *
  * @return true if all functions ran successfully, false otherwise
  */
-bool samba_init_module_fns_run(samba_module_init_fn *fns)
+bool samba_module_init_fns_run(samba_module_init_fn *fns)
 {
 	int i;
 	bool ret = true;
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index f2f9f26eebc..65abeae50b8 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -665,7 +665,7 @@ _PUBLIC_ NTSTATUS auth4_init(void)
 	if (initialized) return NT_STATUS_OK;
 	initialized = true;
 	
-	samba_init_module_fns_run(static_init);
+	samba_module_init_fns_run(static_init);
 	
 	return NT_STATUS_OK;	
 }
diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c
index b452fd80156..04114e9af5c 100644
--- a/source4/ntptr/ntptr_base.c
+++ b/source4/ntptr/ntptr_base.c
@@ -76,8 +76,8 @@ NTSTATUS ntptr_init(void)
 	samba_module_init_fn static_init[] = { STATIC_ntptr_MODULES };
 	samba_module_init_fn *shared_init = samba_modules_load(NULL, "ntptr");
 
-	samba_init_module_fns_run(static_init);
-	samba_init_module_fns_run(shared_init);
+	samba_module_init_fns_run(static_init);
+	samba_module_init_fns_run(shared_init);
 
 	talloc_free(shared_init);
 	
diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index efa1968de82..f34ea7b7dd5 100644
--- a/source4/ntvfs/ntvfs_base.c
+++ b/source4/ntvfs/ntvfs_base.c
@@ -238,8 +238,8 @@ NTSTATUS ntvfs_init(struct loadparm_context *lp_ctx)
 	
 	shared_init = samba_modules_load(NULL, "ntvfs");
 
-	samba_init_module_fns_run(static_init);
-	samba_init_module_fns_run(shared_init);
+	samba_module_init_fns_run(static_init);
+	samba_module_init_fns_run(shared_init);
 
 	talloc_free(shared_init);
 
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index 2372b440fd4..546a8fc01a0 100644
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -95,8 +95,8 @@ NTSTATUS pvfs_acl_init(void)
 
 	shared_init = samba_modules_load(NULL, "pvfs_acl");
 
-	samba_init_module_fns_run(static_init);
-	samba_init_module_fns_run(shared_init);
+	samba_module_init_fns_run(static_init);
+	samba_module_init_fns_run(shared_init);
 
 	talloc_free(shared_init);
 
diff --git a/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c
index 5e8a70fdad1..90986104687 100644
--- a/source4/ntvfs/sysdep/sys_lease.c
+++ b/source4/ntvfs/sysdep/sys_lease.c
@@ -118,7 +118,7 @@ _PUBLIC_ NTSTATUS sys_lease_init(void)
 	if (initialized) return NT_STATUS_OK;
 	initialized = true;
 
-	samba_init_module_fns_run(static_init);
+	samba_module_init_fns_run(static_init);
 
 	return NT_STATUS_OK;
 }
diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c
index dd143d36b42..76dab63da4f 100644
--- a/source4/ntvfs/sysdep/sys_notify.c
+++ b/source4/ntvfs/sysdep/sys_notify.c
@@ -142,7 +142,7 @@ _PUBLIC_ NTSTATUS sys_notify_init(void)
 	if (initialized) return NT_STATUS_OK;
 	initialized = true;
 
-	samba_init_module_fns_run(static_init);
+	samba_module_init_fns_run(static_init);
 	
 	return NT_STATUS_OK;
 }
diff --git a/source4/param/share.c b/source4/param/share.c
index 5204e83fb49..4d2b5d3ba62 100644
--- a/source4/param/share.c
+++ b/source4/param/share.c
@@ -151,7 +151,7 @@ NTSTATUS share_init(void)
 	STATIC_share_MODULES_PROTO;
 	samba_module_init_fn static_init[] = { STATIC_share_MODULES };
 
-	samba_init_module_fns_run(static_init);
+	samba_module_init_fns_run(static_init);
 
 	return NT_STATUS_OK;
 }
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 53eafe07233..1eb2694de2f 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1238,8 +1238,8 @@ void dcerpc_server_init(struct loadparm_context *lp_ctx)
 
 	shared_init = samba_modules_load(NULL, "dcerpc_server");
 
-	samba_init_module_fns_run(static_init);
-	samba_init_module_fns_run(shared_init);
+	samba_module_init_fns_run(static_init);
+	samba_module_init_fns_run(shared_init);
 
 	talloc_free(shared_init);
 }
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index e43e9146d85..d194d19747c 100644
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -114,8 +114,8 @@ _PUBLIC_ NTSTATUS process_model_init(struct loadparm_context *lp_ctx)
 
 	shared_init = samba_modules_load(NULL, "process_model");
 	
-	samba_init_module_fns_run(static_init);
-	samba_init_module_fns_run(shared_init);
+	samba_module_init_fns_run(static_init);
+	samba_module_init_fns_run(shared_init);
 
 	talloc_free(shared_init);
 
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index abc662de790..6df55b88b60 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -411,8 +411,8 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 
 	shared_init = samba_modules_load(NULL, "service");
 
-	samba_init_module_fns_run(static_init);
-	samba_init_module_fns_run(shared_init);
+	samba_module_init_fns_run(static_init);
+	samba_module_init_fns_run(shared_init);
 
 	talloc_free(shared_init);
 	
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index fafc79a36f8..d00351de322 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -51,8 +51,8 @@ _PUBLIC_ int torture_init(void)
 	samba_module_init_fn static_init[] = { STATIC_smbtorture_MODULES };
 	samba_module_init_fn *shared_init = samba_modules_load(NULL, "smbtorture");
 
-	samba_init_module_fns_run(static_init);
-	samba_init_module_fns_run(shared_init);
+	samba_module_init_fns_run(static_init);
+	samba_module_init_fns_run(shared_init);
 
 	talloc_free(shared_init);