summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2017-04-20 12:24:43 -0700
committerJeremy Allison <jra@samba.org>2017-04-22 01:17:00 +0200
commit306783d6f5d577a0b8bd31d659d8c802f22f0333 (patch)
tree20e1c5a45b027d061d3dc0cab9028bbccaef7ab7 /source4/smbd
parent9342b3ebf7fe7b7565406bd9a606b6676c08b029 (diff)
downloadsamba-306783d6f5d577a0b8bd31d659d8c802f22f0333.tar.gz
lib: modules: Change XXX_init interface from XXX_init(void) to XXX_init(TALLOC_CTX *)
Not currently used - no logic changes inside. This will make it possible to pass down a long-lived talloc context from the loading function for modules to use instead of having them internally all use talloc_autofree_context() which is a hidden global. Updated all known module interface numbers, and added a WHATSNEW. Signed-off-by: Jeremy Allison <jra@samba.org> Signed-off-by: Ralph Böhme <slow@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Sat Apr 22 01:17:00 CEST 2017 on sn-devel-144
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/process_model.c6
-rw-r--r--source4/smbd/process_single.c4
-rw-r--r--source4/smbd/process_standard.c4
-rw-r--r--source4/smbd/server.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index bbcbe3b6acc..20a130b70c3 100644
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -101,7 +101,7 @@ _PUBLIC_ NTSTATUS register_process_model(const struct model_ops *ops)
_PUBLIC_ NTSTATUS process_model_init(struct loadparm_context *lp_ctx)
{
-#define _MODULE_PROTO(init) extern NTSTATUS init(void);
+#define _MODULE_PROTO(init) extern NTSTATUS init(TALLOC_CTX *);
STATIC_process_model_MODULES_PROTO;
init_module_fn static_init[] = { STATIC_process_model_MODULES };
init_module_fn *shared_init;
@@ -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);
+ run_init_functions(NULL, static_init);
+ run_init_functions(NULL, shared_init);
talloc_free(shared_init);
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c
index a1b785ee41b..f483e000be7 100644
--- a/source4/smbd/process_single.c
+++ b/source4/smbd/process_single.c
@@ -26,7 +26,7 @@
#include "system/filesys.h"
#include "cluster/cluster.h"
-NTSTATUS process_model_single_init(void);
+NTSTATUS process_model_single_init(TALLOC_CTX *);
/*
called when the process model is selected
@@ -132,7 +132,7 @@ const struct model_ops single_ops = {
initialise the single process model, registering ourselves with the
process model subsystem
*/
-NTSTATUS process_model_single_init(void)
+NTSTATUS process_model_single_init(TALLOC_CTX *ctx)
{
return register_process_model(&single_ops);
}
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index 92f07add42c..967b06468d1 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -39,7 +39,7 @@ struct standard_child_state {
struct tevent_fd *from_child_fde;
};
-NTSTATUS process_model_standard_init(void);
+NTSTATUS process_model_standard_init(TALLOC_CTX *);
/* we hold a pipe open in the parent, and the any child
processes wait for EOF on that pipe. This ensures that
@@ -502,7 +502,7 @@ static const struct model_ops standard_ops = {
/*
initialise the standard process model, registering ourselves with the process model subsystem
*/
-NTSTATUS process_model_standard_init(void)
+NTSTATUS process_model_standard_init(TALLOC_CTX *ctx)
{
return register_process_model(&standard_ops);
}
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index fdc36dec129..a8bad06bed3 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -343,7 +343,7 @@ static int binary_smbd_main(const char *binary_name,
bool opt_interactive = false;
int opt;
poptContext pc;
-#define _MODULE_PROTO(init) extern NTSTATUS init(void);
+#define _MODULE_PROTO(init) extern NTSTATUS init(TALLOC_CTX *);
STATIC_service_MODULES_PROTO;
init_module_fn static_init[] = { STATIC_service_MODULES };
init_module_fn *shared_init;
@@ -484,8 +484,8 @@ static int binary_smbd_main(const char *binary_name,
shared_init = load_samba_modules(NULL, "service");
- run_init_functions(static_init);
- run_init_functions(shared_init);
+ run_init_functions(NULL, static_init);
+ run_init_functions(NULL, shared_init);
talloc_free(shared_init);