lib/util Rename load_samba_modules -> samba_modules_load

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 4454dc74f2f7a9c5067c3e551d86202666beffa6..43125e8f1a1887c13b231816e226c357cc53fd48 100644 (file)
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -887,7 +887,7 @@ _PUBLIC_ NTSTATUS gensec_init(void)
        if (initialized) return NT_STATUS_OK;
        initialized = true;
 
-       shared_init = load_samba_modules(NULL, "gensec");
+       shared_init = samba_modules_load(NULL, "gensec");
 
        samba_init_module_fns_run(static_init);
        samba_init_module_fns_run(shared_init);

diff --git a/lib/util/modules.c b/lib/util/modules.c
index 34ad06c69f916a7a7cafd8a8d5cbeecee28f793d..e9e6bf5dc83662a0278f32637572647e7cd41930 100644 (file)
--- a/lib/util/modules.c
+++ b/lib/util/modules.c
@@ -143,7 +143,7 @@ bool samba_init_module_fns_run(samba_init_module_fn *fns)
  * Will return an array of function pointers to initialization functions
  */
 
-samba_init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem)
+samba_init_module_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem)
 {
        char *path = modules_path(mem_ctx, subsystem);
        samba_init_module_fn *ret;

diff --git a/lib/util/samba_modules.h b/lib/util/samba_modules.h
index be025ea7c1e75ac432fa87241ef0a925ec542d20..a3d7609cb69e54fa1bf350ee8082294910659149 100644 (file)
--- a/lib/util/samba_modules.h
+++ b/lib/util/samba_modules.h
@@ -51,7 +51,7 @@ bool samba_init_module_fns_run(samba_init_module_fn *fns);
  *
  * Will return an array of function pointers to initialization functions
  */
-samba_init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem);
+samba_init_module_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem);
 
 int smb_load_modules(const char **modules);
 NTSTATUS smb_probe_module(const char *subsystem, const char *module);

diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c
index 9795d1525faf3bf0742ae78a3af6d44044a1dbae..425a311fe5d128f743d9058a4c059235829a50eb 100644 (file)
--- a/source4/ntptr/ntptr_base.c
+++ b/source4/ntptr/ntptr_base.c
@@ -74,7 +74,7 @@ NTSTATUS ntptr_init(void)
 #define _MODULE_PROTO(init) extern NTSTATUS init(void);
        STATIC_ntptr_MODULES_PROTO;
        samba_init_module_fn static_init[] = { STATIC_ntptr_MODULES };
-       samba_init_module_fn *shared_init = load_samba_modules(NULL, "ntptr");
+       samba_init_module_fn *shared_init = samba_modules_load(NULL, "ntptr");
 
        samba_init_module_fns_run(static_init);
        samba_init_module_fns_run(shared_init);

diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index 034536d694a28ab5a9fac166339449bb4e2bdf31..fa4167e03d6b52e1bda24490b47c1489c2adb937 100644 (file)
--- a/source4/ntvfs/ntvfs_base.c
+++ b/source4/ntvfs/ntvfs_base.c
@@ -236,7 +236,7 @@ NTSTATUS ntvfs_init(struct loadparm_context *lp_ctx)
        if (initialized) return NT_STATUS_OK;
        initialized = true;
        
-       shared_init = load_samba_modules(NULL, "ntvfs");
+       shared_init = samba_modules_load(NULL, "ntvfs");
 
        samba_init_module_fns_run(static_init);
        samba_init_module_fns_run(shared_init);

diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index 3f9626ed8ab2c78458200e1cf7af0c97d2692f57..2bff4be3049b5ab2297f524d24f5a4b0e9029933 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -93,7 +93,7 @@ NTSTATUS pvfs_acl_init(void)
        if (initialized) return NT_STATUS_OK;
        initialized = true;
 
-       shared_init = load_samba_modules(NULL, "pvfs_acl");
+       shared_init = samba_modules_load(NULL, "pvfs_acl");
 
        samba_init_module_fns_run(static_init);
        samba_init_module_fns_run(shared_init);

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 6422f8fffcf5f696df913d18b01044e5d4fd2598..63bf1c0daf713b669654bccb2713989943e7366b 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1236,7 +1236,7 @@ void dcerpc_server_init(struct loadparm_context *lp_ctx)
        }
        initialized = true;
 
-       shared_init = load_samba_modules(NULL, "dcerpc_server");
+       shared_init = samba_modules_load(NULL, "dcerpc_server");
 
        samba_init_module_fns_run(static_init);
        samba_init_module_fns_run(shared_init);

diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index e9e8ffa854957dcc0fea9ea06e43f38614e471ef..6e1252c718992b5af877f9348ea8b91d6d080463 100644 (file)
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -112,7 +112,7 @@ _PUBLIC_ NTSTATUS process_model_init(struct loadparm_context *lp_ctx)
        }
        initialised = true;
 
-       shared_init = load_samba_modules(NULL, "process_model");
+       shared_init = samba_modules_load(NULL, "process_model");
        
        samba_init_module_fns_run(static_init);
        samba_init_module_fns_run(shared_init);

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 67d11ee35cb3b8e6b4e2e268081638f2c6cc1dce..e925dd4e3f915abe4d5fa5e65927b84d6599f5a1 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -409,7 +409,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 
        process_model_init(cmdline_lp_ctx); 
 
-       shared_init = load_samba_modules(NULL, "service");
+       shared_init = samba_modules_load(NULL, "service");
 
        samba_init_module_fns_run(static_init);
        samba_init_module_fns_run(shared_init);

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 73208f8256b06fbf0f1983e390ebe8883a53c80a..50ff4c96fc503b1201df3e38fe7115d20a361d60 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -49,7 +49,7 @@ _PUBLIC_ int torture_init(void)
 #define _MODULE_PROTO(init) extern NTSTATUS init(void);
        STATIC_smbtorture_MODULES_PROTO;
        samba_init_module_fn static_init[] = { STATIC_smbtorture_MODULES };
-       samba_init_module_fn *shared_init = load_samba_modules(NULL, "smbtorture");
+       samba_init_module_fn *shared_init = samba_modules_load(NULL, "smbtorture");
 
        samba_init_module_fns_run(static_init);
        samba_init_module_fns_run(shared_init);