summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--auth/gensec/gensec_start.c4
-rw-r--r--lib/util/modules.c2
-rw-r--r--lib/util/samba_modules.h2
-rw-r--r--source4/auth/ntlm/auth.c2
-rw-r--r--source4/ntptr/ntptr_base.c4
-rw-r--r--source4/ntvfs/ntvfs_base.c4
-rw-r--r--source4/ntvfs/posix/pvfs_acl.c4
-rw-r--r--source4/ntvfs/sysdep/sys_lease.c2
-rw-r--r--source4/ntvfs/sysdep/sys_notify.c2
-rw-r--r--source4/param/share.c2
-rw-r--r--source4/rpc_server/dcerpc_server.c4
-rw-r--r--source4/smbd/process_model.c4
-rw-r--r--source4/smbd/server.c4
-rw-r--r--source4/torture/torture.c4
14 files changed, 22 insertions, 22 deletions
diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index 4b285c645d..4454dc74f2 100644
--- 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 a597191c93..34ad06c69f 100644
--- 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 5b912b3987..be025ea7c1 100644
--- 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 2d51833bd9..870f8a9ba3 100644
--- 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 ce335c69b0..9795d1525f 100644
--- 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 6f0be54c29..034536d694 100644
--- 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 57bae0a027..3f9626ed8a 100644
--- 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 22fc3147b0..35d99c1938 100644
--- 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 43f11a20ee..660e87f51a 100644
--- 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 9e58bb73cc..bdd12df2aa 100644
--- 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 f2fe13dd9b..6422f8fffc 100644
--- 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 8080787a12..e9e8ffa854 100644
--- 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 c6b9900c0e..67d11ee35c 100644
--- 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 155a346956..73208f8256 100644
--- 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);
generated by cgit (git 2.34.1) at 2024-12-03 21:28:40 +0000