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

diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index 78141334bfe81f7c99831400bf9040011cad359e..def4af33ed3420ad1ba1737c1f04103711b3899a 100644 (file)
--- 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 fd3da7552e1f6f4b3ead52711e15c17b57a105ab..6dc42eaf08828fe659bbfca3d584bc880e79d336 100644 (file)
--- 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 f2f9f26eebcc605b47668e64d41e66bda5ed6fd3..65abeae50b89e41f0e8c3b15539701f27e125783 100644 (file)
--- 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 b452fd8015682311bb540c3c378c6ef144be7b4d..04114e9af5c71472994db6517559497dda43abeb 100644 (file)
--- 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 efa1968de822dddde1ca6541f4e4439caa474e09..f34ea7b7dd5f69159765d52c374cd8d96a646aa4 100644 (file)
--- 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 2372b440fd42c9134e230fb5993829d01b078452..546a8fc01a0c3b46968a1723f91fd4ceaef0c05d 100644 (file)
--- 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 5e8a70fdad1b303dd1e7bb5dec9874509901f8f1..909861046870e472f779caf6c1bb5d2d50419055 100644 (file)
--- 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 dd143d36b42756bd30c52bf84ca8fc8748fe8500..76dab63da4f9635cf6d9b00b6d7fec04e9f5254b 100644 (file)
--- 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 5204e83fb49d8cdcc5696d75c4c7d305798f54d5..4d2b5d3ba621fde8c763f2218ded29d16854375d 100644 (file)
--- 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 53eafe07233d6142238c598e1f33fb723845afae..1eb2694de2f7ae76460cb87df13aa1f2da731daa 100644 (file)
--- 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 e43e9146d856a0ade84651506c78bb89675b0c87..d194d19747c5a79256ddf2979fb4d7ba95229f00 100644 (file)
--- 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 abc662de7901627fd4d68a65a4b40e4b598e7536..6df55b88b609711b045e34ac213de9c441d07340 100644 (file)
--- 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 fafc79a36f8a65280f7a1363dd0e122d4deb50d2..d00351de3227cc91202c933e305bfc85213e97cf 100644 (file)
--- 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);