summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-06 14:58:28 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-06 17:37:51 +1000
commit907cdb5de7f16a2540299aeba211bf2a5ae6fafe (patch)
treeeccc984eb3fd073eb49478ff47163dfdf10d7a29 /source4/smbd
parentf67a14976bd6ccdacd319df872e6add994f0e0f3 (diff)
downloadsamba-907cdb5de7f16a2540299aeba211bf2a5ae6fafe.tar.gz
samba-907cdb5de7f16a2540299aeba211bf2a5ae6fafe.tar.bz2
samba-907cdb5de7f16a2540299aeba211bf2a5ae6fafe.zip
s4-modules Remove lp_ctx from init functions that no longer need it
Now that we don't allow the smb.conf to change the modules dir, many functions that simply load modules or initialise a subsytem that may load modules no longer need an lp_ctx. Andrew Bartlett
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/process_model.c2
-rw-r--r--source4/smbd/server.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index af12a7b8cb..3c4c03ebf2 100644
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -111,7 +111,7 @@ _PUBLIC_ NTSTATUS process_model_init(struct loadparm_context *lp_ctx)
}
initialised = true;
- shared_init = load_samba_modules(NULL, lp_ctx, "process_model");
+ shared_init = load_samba_modules(NULL, "process_model");
run_init_functions(static_init);
run_init_functions(shared_init);
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 8daf5d4c11..53dc20d636 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -401,9 +401,9 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
}
}
- gensec_init(cmdline_lp_ctx); /* FIXME: */
+ gensec_init(); /* FIXME: */
- ntptr_init(cmdline_lp_ctx); /* FIXME: maybe run this in the initialization function
+ ntptr_init(); /* FIXME: maybe run this in the initialization function
of the spoolss RPC server instead? */
ntvfs_init(cmdline_lp_ctx); /* FIXME: maybe run this in the initialization functions
@@ -411,7 +411,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, cmdline_lp_ctx, "service");
+ shared_init = load_samba_modules(NULL, "service");
run_init_functions(static_init);
run_init_functions(shared_init);