lib/util Rename load_samba_modules -> samba_modules_load

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

Andrew Bartlett

7 files changed, 7 insertions, 7 deletions

diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c
index 9795d1525f..425a311fe5 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_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 034536d694..fa4167e03d 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 = 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 3f9626ed8a..2bff4be304 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 = 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 6422f8fffc..63bf1c0daf 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 = 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 e9e8ffa854..6e1252c718 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 = 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 67d11ee35c..e925dd4e3f 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 = 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 73208f8256..50ff4c96fc 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_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);