lib/util Rename run_init_functions -> samba_init_module_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 4b285c645d74ba32840631d296dadd3aead8aaf8..4454dc74f2f7a9c5067c3e551d86202666beffa6 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 = load_samba_modules(NULL, "gensec");
 
-       run_init_functions(static_init);
-       run_init_functions(shared_init);
+       samba_init_module_fns_run(static_init);
+       samba_init_module_fns_run(shared_init);
 
        talloc_free(shared_init);
 

diff --git a/lib/util/modules.c b/lib/util/modules.c
index a597191c937364e634c29a98b82d31d40dca430a..34ad06c69f916a7a7cafd8a8d5cbeecee28f793d 100644 (file)
--- a/lib/util/modules.c
+++ b/lib/util/modules.c
@@ -124,7 +124,7 @@ static samba_init_module_fn *load_modules(TALLOC_CTX *mem_ctx, const char *path)
  *
  * @return true if all functions ran successfully, false otherwise
  */
-bool run_init_functions(samba_init_module_fn *fns)
+bool samba_init_module_fns_run(samba_init_module_fn *fns)
 {
        int i;
        bool ret = true;

diff --git a/lib/util/samba_modules.h b/lib/util/samba_modules.h
index 5b912b39872dac998974ebe7860d13cf70d4680d..be025ea7c1e75ac432fa87241ef0a925ec542d20 100644 (file)
--- a/lib/util/samba_modules.h
+++ b/lib/util/samba_modules.h
@@ -44,7 +44,7 @@ samba_init_module_fn load_module(const char *path, bool is_probe, void **handle)
  *
  * @return true if all functions ran successfully, false otherwise
  */
-bool run_init_functions(samba_init_module_fn *fns);
+bool samba_init_module_fns_run(samba_init_module_fn *fns);
 
 /**
  * Load the initialization functions from DSO files for a specific subsystem.

diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 2d51833bd98ef0ee32561954a08c93ef57f80067..870f8a9ba32dad49c0c4dd60804b6f6d1d298b5d 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;
        
-       run_init_functions(static_init);
+       samba_init_module_fns_run(static_init);
        
        return NT_STATUS_OK;    
 }

diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c
index ce335c69b0227a3d2acc2f92c57faf5f7811c8e9..9795d1525faf3bf0742ae78a3af6d44044a1dbae 100644 (file)
--- a/source4/ntptr/ntptr_base.c
+++ b/source4/ntptr/ntptr_base.c
@@ -76,8 +76,8 @@ NTSTATUS ntptr_init(void)
        samba_init_module_fn static_init[] = { STATIC_ntptr_MODULES };
        samba_init_module_fn *shared_init = load_samba_modules(NULL, "ntptr");
 
-       run_init_functions(static_init);
-       run_init_functions(shared_init);
+       samba_init_module_fns_run(static_init);
+       samba_init_module_fns_run(shared_init);
 
        talloc_free(shared_init);
        

diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index 6f0be54c29e87c3d8adf682be38dbfecccd5de2b..034536d694a28ab5a9fac166339449bb4e2bdf31 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 = load_samba_modules(NULL, "ntvfs");
 
-       run_init_functions(static_init);
-       run_init_functions(shared_init);
+       samba_init_module_fns_run(static_init);
+       samba_init_module_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 57bae0a02762cc553114f4f12029f347a6de88fe..3f9626ed8ab2c78458200e1cf7af0c97d2692f57 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 = load_samba_modules(NULL, "pvfs_acl");
 
-       run_init_functions(static_init);
-       run_init_functions(shared_init);
+       samba_init_module_fns_run(static_init);
+       samba_init_module_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 22fc3147b033bed8e5c0f26acd372b1efb06d235..35d99c19384dddb0413eeb90dc03ac2b032942c6 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;
 
-       run_init_functions(static_init);
+       samba_init_module_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 43f11a20ee90aecd7dd2ddc9a7d26a927294b2f3..660e87f51a3df7b7d997251a809b6c07f31ad984 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;
 
-       run_init_functions(static_init);
+       samba_init_module_fns_run(static_init);
        
        return NT_STATUS_OK;
 }

diff --git a/source4/param/share.c b/source4/param/share.c
index 9e58bb73ccd7fc091571dcd683e38ab90c8e77d3..bdd12df2aaab3588d3819cf69a457cc5a94ad71c 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_init_module_fn static_init[] = { STATIC_share_MODULES };
 
-       run_init_functions(static_init);
+       samba_init_module_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 f2fe13dd9b80b803d5ba40d0230bd11912db7883..6422f8fffcf5f696df913d18b01044e5d4fd2598 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 = load_samba_modules(NULL, "dcerpc_server");
 
-       run_init_functions(static_init);
-       run_init_functions(shared_init);
+       samba_init_module_fns_run(static_init);
+       samba_init_module_fns_run(shared_init);
 
        talloc_free(shared_init);
 }

diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index 8080787a12c640e9bf16953eae72391639315238..e9e8ffa854957dcc0fea9ea06e43f38614e471ef 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 = load_samba_modules(NULL, "process_model");
        
-       run_init_functions(static_init);
-       run_init_functions(shared_init);
+       samba_init_module_fns_run(static_init);
+       samba_init_module_fns_run(shared_init);
 
        talloc_free(shared_init);
 

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index c6b9900c0e44122957dfbbd2192627f616c69cd3..67d11ee35cb3b8e6b4e2e268081638f2c6cc1dce 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 = load_samba_modules(NULL, "service");
 
-       run_init_functions(static_init);
-       run_init_functions(shared_init);
+       samba_init_module_fns_run(static_init);
+       samba_init_module_fns_run(shared_init);
 
        talloc_free(shared_init);
        

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 155a34695628f9221c846418390a826eb2dc0f61..73208f8256b06fbf0f1983e390ebe8883a53c80a 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -51,8 +51,8 @@ _PUBLIC_ int torture_init(void)
        samba_init_module_fn static_init[] = { STATIC_smbtorture_MODULES };
        samba_init_module_fn *shared_init = load_samba_modules(NULL, "smbtorture");
 
-       run_init_functions(static_init);
-       run_init_functions(shared_init);
+       samba_init_module_fns_run(static_init);
+       samba_init_module_fns_run(shared_init);
 
        talloc_free(shared_init);