lib/util Rename samba_modules_load -> samba_module_init_fns_for_subsystem

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

Andrew Bartlett

10 files changed, 10 insertions, 10 deletions

diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index def4af33ed..a48606f7cd 100644
--- 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 = samba_modules_load(NULL, "gensec");
+	shared_init = samba_module_init_fns_for_subsystem(NULL, "gensec");
 
 	samba_module_init_fns_run(static_init);
 	samba_module_init_fns_run(shared_init);
diff --git a/lib/util/samba_module.c b/lib/util/samba_module.c
index 6dc42eaf08..b15885be03 100644
--- a/lib/util/samba_module.c
+++ b/lib/util/samba_module.c
@@ -49,7 +49,7 @@ bool samba_module_init_fns_run(samba_module_init_fn *fns)
  * Will return an array of function pointers to initialization functions
  */
 
-samba_module_init_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem)
+samba_module_init_fn *samba_module_init_fns_for_subsystem(TALLOC_CTX *mem_ctx, const char *subsystem)
 {
 	char *path = modules_path(mem_ctx, subsystem);
 	samba_module_init_fn *ret;
diff --git a/lib/util/samba_module.h b/lib/util/samba_module.h
index 6d32fce48e..fa9a6b905d 100644
--- a/lib/util/samba_module.h
+++ b/lib/util/samba_module.h
@@ -44,6 +44,6 @@ bool samba_module_init_fns_run(samba_module_init_fn *fns);
  *
  * Will return an array of function pointers to initialization functions
  */
-samba_module_init_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem);
+samba_module_init_fn *samba_module_init_fns_for_subsystem(TALLOC_CTX *mem_ctx, const char *subsystem);
 
 #endif /* _SAMBA_MODULES_H */
diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c
index 04114e9af5..9b89f8a6fc 100644
--- 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_module_init_fn static_init[] = { STATIC_ntptr_MODULES };
-	samba_module_init_fn *shared_init = samba_modules_load(NULL, "ntptr");
+	samba_module_init_fn *shared_init = samba_module_init_fns_for_subsystem(NULL, "ntptr");
 
 	samba_module_init_fns_run(static_init);
 	samba_module_init_fns_run(shared_init);
diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index f34ea7b7dd..fbf7d12ec3 100644
--- 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 = samba_modules_load(NULL, "ntvfs");
+	shared_init = samba_module_init_fns_for_subsystem(NULL, "ntvfs");
 
 	samba_module_init_fns_run(static_init);
 	samba_module_init_fns_run(shared_init);
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index 546a8fc01a..d040537001 100644
--- 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 = samba_modules_load(NULL, "pvfs_acl");
+	shared_init = samba_module_init_fns_for_subsystem(NULL, "pvfs_acl");
 
 	samba_module_init_fns_run(static_init);
 	samba_module_init_fns_run(shared_init);
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 1eb2694de2..9dff4e4bb1 100644
--- 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 = samba_modules_load(NULL, "dcerpc_server");
+	shared_init = samba_module_init_fns_for_subsystem(NULL, "dcerpc_server");
 
 	samba_module_init_fns_run(static_init);
 	samba_module_init_fns_run(shared_init);
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index d194d19747..b3ac07e4a6 100644
--- 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 = samba_modules_load(NULL, "process_model");
+	shared_init = samba_module_init_fns_for_subsystem(NULL, "process_model");
 	
 	samba_module_init_fns_run(static_init);
 	samba_module_init_fns_run(shared_init);
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 6df55b88b6..a2f4a785ad 100644
--- 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 = samba_modules_load(NULL, "service");
+	shared_init = samba_module_init_fns_for_subsystem(NULL, "service");
 
 	samba_module_init_fns_run(static_init);
 	samba_module_init_fns_run(shared_init);
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index d00351de32..dc35073eba 100644
--- 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_module_init_fn static_init[] = { STATIC_smbtorture_MODULES };
-	samba_module_init_fn *shared_init = samba_modules_load(NULL, "smbtorture");
+	samba_module_init_fn *shared_init = samba_module_init_fns_for_subsystem(NULL, "smbtorture");
 
 	samba_module_init_fns_run(static_init);
 	samba_module_init_fns_run(shared_init);