From 907cdb5de7f16a2540299aeba211bf2a5ae6fafe Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 6 Jun 2011 14:58:28 +1000 Subject: 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 --- source4/auth/gensec/gensec.c | 4 ++-- source4/auth/gensec/gensec.h | 2 +- source4/auth/gensec/pygensec.c | 4 ++-- source4/client/cifsdd.c | 2 +- source4/client/client.c | 2 +- source4/lib/ldb-samba/samba_extensions.c | 2 +- source4/lib/registry/rpc.c | 2 +- source4/libcli/ldap/ldap_bind.c | 2 +- source4/libnet/libnet.c | 2 +- source4/librpc/rpc/dcerpc.c | 4 ++-- source4/librpc/rpc/dcerpc.h | 2 +- source4/librpc/rpc/pyrpc_util.c | 2 +- source4/ntptr/ntptr_base.c | 4 ++-- source4/ntvfs/ntvfs_base.c | 2 +- source4/ntvfs/posix/pvfs_acl.c | 4 ++-- source4/ntvfs/posix/vfs_posix.c | 2 +- source4/param/param.h | 2 +- source4/param/util.c | 2 +- source4/rpc_server/dcerpc_server.c | 2 +- source4/samba_tool/samba_tool.c | 2 +- source4/smbd/process_model.c | 2 +- source4/smbd/server.c | 6 +++--- source4/torture/gentest.c | 2 +- source4/torture/locktest.c | 2 +- source4/torture/masktest.c | 2 +- source4/torture/rpc/rpc.c | 2 +- source4/torture/smbtorture.c | 2 +- source4/torture/torture.c | 2 +- source4/utils/ntlm_auth.c | 2 +- 29 files changed, 36 insertions(+), 36 deletions(-) diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c index 9b0dbfffbc..b91e790d3c 100644 --- a/source4/auth/gensec/gensec.c +++ b/source4/auth/gensec/gensec.c @@ -1406,7 +1406,7 @@ bool gensec_setting_bool(struct gensec_settings *settings, const char *mechanism /* initialise the GENSEC subsystem */ -_PUBLIC_ NTSTATUS gensec_init(struct loadparm_context *lp_ctx) +_PUBLIC_ NTSTATUS gensec_init(void) { static bool initialized = false; #define _MODULE_PROTO(init) extern NTSTATUS init(void); @@ -1417,7 +1417,7 @@ _PUBLIC_ NTSTATUS gensec_init(struct loadparm_context *lp_ctx) if (initialized) return NT_STATUS_OK; initialized = true; - shared_init = load_samba_modules(NULL, lp_ctx, "gensec"); + shared_init = load_samba_modules(NULL, "gensec"); run_init_functions(static_init); run_init_functions(shared_init); diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h index 28bed6c3b7..e42b4aa5d2 100644 --- a/source4/auth/gensec/gensec.h +++ b/source4/auth/gensec/gensec.h @@ -242,7 +242,7 @@ NTSTATUS gensec_start_mech_by_oid(struct gensec_security *gensec_security, const char *mech_oid); const char *gensec_get_name_by_oid(struct gensec_security *gensec_security, const char *oid_string); struct cli_credentials *gensec_get_credentials(struct gensec_security *gensec_security); -NTSTATUS gensec_init(struct loadparm_context *lp_ctx); +NTSTATUS gensec_init(void); NTSTATUS gensec_unseal_packet(struct gensec_security *gensec_security, TALLOC_CTX *mem_ctx, uint8_t *data, size_t length, diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c index 004cc4a76e..503974aaa3 100644 --- a/source4/auth/gensec/pygensec.c +++ b/source4/auth/gensec/pygensec.c @@ -127,7 +127,7 @@ static PyObject *py_gensec_start_client(PyTypeObject *type, PyObject *args, PyOb return NULL; } - status = gensec_init(settings->lp_ctx); + status = gensec_init(); if (!NT_STATUS_IS_OK(status)) { PyErr_SetNTSTATUS(status); PyObject_DEL(self); @@ -210,7 +210,7 @@ static PyObject *py_gensec_start_server(PyTypeObject *type, PyObject *args, PyOb } } - status = gensec_init(settings->lp_ctx); + status = gensec_init(); if (!NT_STATUS_IS_OK(status)) { PyErr_SetNTSTATUS(status); PyObject_DEL(self); diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c index 3ce7277614..dd6f1377e8 100644 --- a/source4/client/cifsdd.c +++ b/source4/client/cifsdd.c @@ -597,7 +597,7 @@ int main(int argc, const char ** argv) ev = s4_event_context_init(talloc_autofree_context()); - gensec_init(cmdline_lp_ctx); + gensec_init(); dump_args(); if (check_arg_numeric("ibs") == 0 || check_arg_numeric("ibs") == 0) { diff --git a/source4/client/client.c b/source4/client/client.c index 27535a1cd3..2f353aec4e 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -3233,7 +3233,7 @@ static int do_message_op(const char *netbios_name, const char *desthost, } } - gensec_init(cmdline_lp_ctx); + gensec_init(); if(poptPeekArg(pc)) { char *s = strdup(poptGetArg(pc)); diff --git a/source4/lib/ldb-samba/samba_extensions.c b/source4/lib/ldb-samba/samba_extensions.c index 63b0f3df91..be9f36a5a7 100644 --- a/source4/lib/ldb-samba/samba_extensions.c +++ b/source4/lib/ldb-samba/samba_extensions.c @@ -82,7 +82,7 @@ static int extensions_hook(struct ldb_context *ldb, enum ldb_module_hook_type t) if (r != LDB_SUCCESS) { return ldb_operr(ldb); } - gensec_init(cmdline_lp_ctx); + gensec_init(); if (ldb_set_opaque(ldb, "sessionInfo", system_session(cmdline_lp_ctx))) { return ldb_operr(ldb); diff --git a/source4/lib/registry/rpc.c b/source4/lib/registry/rpc.c index f1e14c1b86..42b7374f7a 100644 --- a/source4/lib/registry/rpc.c +++ b/source4/lib/registry/rpc.c @@ -485,7 +485,7 @@ _PUBLIC_ WERROR reg_open_remote(struct registry_context **ctx, struct dcerpc_pipe *p; struct rpc_registry_context *rctx; - dcerpc_init(lp_ctx); + dcerpc_init(); rctx = talloc(NULL, struct rpc_registry_context); W_ERROR_HAVE_NO_MEMORY(rctx); diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c index 65659794c5..f5cf25ec3f 100644 --- a/source4/libcli/ldap/ldap_bind.c +++ b/source4/libcli/ldap/ldap_bind.c @@ -221,7 +221,7 @@ _PUBLIC_ NTSTATUS ldap_bind_sasl(struct ldap_connection *conn, NULL }; - gensec_init(lp_ctx); + gensec_init(); status = gensec_client_start(conn, &conn->gensec, conn->event.event_ctx, diff --git a/source4/libnet/libnet.c b/source4/libnet/libnet.c index 53ebb9e34a..32df85d527 100644 --- a/source4/libnet/libnet.c +++ b/source4/libnet/libnet.c @@ -43,7 +43,7 @@ struct libnet_context *libnet_context_init(struct tevent_context *ev, ctx->lp_ctx = lp_ctx; /* make sure dcerpc is initialized */ - dcerpc_init(lp_ctx); + dcerpc_init(); /* name resolution methods */ ctx->resolve_ctx = lpcfg_resolve_context(lp_ctx); diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index cc72866866..c199dc700a 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -76,9 +76,9 @@ struct rpc_request { } async; }; -_PUBLIC_ NTSTATUS dcerpc_init(struct loadparm_context *lp_ctx) +_PUBLIC_ NTSTATUS dcerpc_init() { - return gensec_init(lp_ctx); + return gensec_init(); } static void dcerpc_connection_dead(struct dcecli_connection *conn, NTSTATUS status); diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index 5ca6246343..22afdf880f 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -198,7 +198,7 @@ NTSTATUS dcerpc_bind_auth_schannel(TALLOC_CTX *tmp_ctx, struct loadparm_context *lp_ctx, uint8_t auth_level); struct tevent_context *dcerpc_event_context(struct dcerpc_pipe *p); -NTSTATUS dcerpc_init(struct loadparm_context *lp_ctx); +NTSTATUS dcerpc_init(void); struct smbcli_tree *dcerpc_smb_tree(struct dcecli_connection *c); uint16_t dcerpc_smb_fnum(struct dcecli_connection *c); NTSTATUS dcerpc_secondary_context(struct dcerpc_pipe *p, diff --git a/source4/librpc/rpc/pyrpc_util.c b/source4/librpc/rpc/pyrpc_util.c index 7784c81cef..385acc87e5 100644 --- a/source4/librpc/rpc/pyrpc_util.c +++ b/source4/librpc/rpc/pyrpc_util.c @@ -119,7 +119,7 @@ PyObject *py_dcerpc_interface_init_helper(PyTypeObject *type, PyObject *args, Py return NULL; } - status = dcerpc_init(lp_ctx); + status = dcerpc_init(); if (!NT_STATUS_IS_OK(status)) { PyErr_SetNTSTATUS(status); talloc_free(mem_ctx); diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c index 268e84b127..42e7b10d4a 100644 --- a/source4/ntptr/ntptr_base.c +++ b/source4/ntptr/ntptr_base.c @@ -68,12 +68,12 @@ NTSTATUS ntptr_register(const void *_ops) return NT_STATUS_OK; } -NTSTATUS ntptr_init(struct loadparm_context *lp_ctx) +NTSTATUS ntptr_init(void) { #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_ntptr_MODULES_PROTO; init_module_fn static_init[] = { STATIC_ntptr_MODULES }; - init_module_fn *shared_init = load_samba_modules(NULL, lp_ctx, "ntptr"); + init_module_fn *shared_init = load_samba_modules(NULL, "ntptr"); run_init_functions(static_init); run_init_functions(shared_init); diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c index 1a83d27843..448d2919df 100644 --- a/source4/ntvfs/ntvfs_base.c +++ b/source4/ntvfs/ntvfs_base.c @@ -235,7 +235,7 @@ NTSTATUS ntvfs_init(struct loadparm_context *lp_ctx) if (initialized) return NT_STATUS_OK; initialized = true; - shared_init = load_samba_modules(NULL, lp_ctx, "ntvfs"); + shared_init = load_samba_modules(NULL, "ntvfs"); run_init_functions(static_init); run_init_functions(shared_init); diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index 67b544d4de..d7a778e1f7 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -89,7 +89,7 @@ const struct pvfs_acl_ops *pvfs_acl_backend_byname(const char *name) return NULL; } -NTSTATUS pvfs_acl_init(struct loadparm_context *lp_ctx) +NTSTATUS pvfs_acl_init(void) { static bool initialized = false; #define _MODULE_PROTO(init) extern NTSTATUS init(void); @@ -100,7 +100,7 @@ NTSTATUS pvfs_acl_init(struct loadparm_context *lp_ctx) if (initialized) return NT_STATUS_OK; initialized = true; - shared_init = load_samba_modules(NULL, lp_ctx, "pvfs_acl"); + shared_init = load_samba_modules(NULL, "pvfs_acl"); run_init_functions(static_init); run_init_functions(shared_init); diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index 4c1404eec5..5b89f1e608 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -212,7 +212,7 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs, * TODO: call this from ntvfs_posix_init() * but currently we don't have a lp_ctx there */ - status = pvfs_acl_init(ntvfs->ctx->lp_ctx); + status = pvfs_acl_init(); NT_STATUS_NOT_OK_RETURN(status); pvfs = talloc_zero(ntvfs, struct pvfs_state); diff --git a/source4/param/param.h b/source4/param/param.h index f8ce15d7b6..4ba9d497f8 100644 --- a/source4/param/param.h +++ b/source4/param/param.h @@ -324,7 +324,7 @@ bool run_init_functions(init_module_fn *fns); * * Will return an array of function pointers to initialization functions */ -init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *subsystem); +init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem); const char *lpcfg_imessaging_path(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx); struct smb_iconv_handle *smb_iconv_handle_reinit_lp(TALLOC_CTX *mem_ctx, diff --git a/source4/param/util.c b/source4/param/util.c index bcb5be1974..139a8acc74 100644 --- a/source4/param/util.c +++ b/source4/param/util.c @@ -272,7 +272,7 @@ bool run_init_functions(init_module_fn *fns) * Will return an array of function pointers to initialization functions */ -init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *subsystem) +init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, const char *subsystem) { char *path = modules_path(mem_ctx, subsystem); init_module_fn *ret; diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 394a3511c2..b738c9d585 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -1235,7 +1235,7 @@ void dcerpc_server_init(struct loadparm_context *lp_ctx) } initialized = true; - shared_init = load_samba_modules(NULL, lp_ctx, "dcerpc_server"); + shared_init = load_samba_modules(NULL, "dcerpc_server"); run_init_functions(static_init); run_init_functions(shared_init); diff --git a/source4/samba_tool/samba_tool.c b/source4/samba_tool/samba_tool.c index 8dfbb83298..ce22944420 100644 --- a/source4/samba_tool/samba_tool.c +++ b/source4/samba_tool/samba_tool.c @@ -299,7 +299,7 @@ static int binary_net(int argc, const char **argv) setlinebuf(stdout); - dcerpc_init(cmdline_lp_ctx); + dcerpc_init(); ev = s4_event_context_init(NULL); if (!ev) { 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); diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index 6f69460dc8..37ae2c03e5 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -3247,7 +3247,7 @@ static bool split_unc_name(const char *unc, char **server, char **share) ev = s4_event_context_init(talloc_autofree_context()); - gensec_init(lp_ctx); + gensec_init(); ret = start_gentest(ev, lp_ctx); diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index 445a626e7b..77fcb69eaf 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -644,7 +644,7 @@ static void usage(poptContext pc) ev = s4_event_context_init(talloc_autofree_context()); - gensec_init(lp_ctx); + gensec_init(); DEBUG(0,("seed=%u base=%d range=%d min_length=%d\n", seed, lock_base, lock_range, min_length)); diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index 65c844bc27..a711634b24 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -360,7 +360,7 @@ static void usage(poptContext pc) ev = s4_event_context_init(mem_ctx); - gensec_init(lp_ctx); + gensec_init(); lpcfg_smbcli_options(lp_ctx, &options); lpcfg_smbcli_session_options(lp_ctx, &session_options); diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index 03936f22ff..01ce93f373 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -75,7 +75,7 @@ _PUBLIC_ NTSTATUS torture_rpc_connection(struct torture_context *tctx, NTSTATUS status; struct dcerpc_binding *binding; - dcerpc_init(tctx->lp_ctx); + dcerpc_init(); status = torture_rpc_binding(tctx, &binding); if (NT_STATUS_IS_ERR(status)) diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 62cf0abfb7..83816e8be5 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -686,7 +686,7 @@ int main(int argc,char *argv[]) torture->lp_ctx = cmdline_lp_ctx; - gensec_init(cmdline_lp_ctx); + gensec_init(); if (shell) { /* In shell mode, just ignore any remaining test names. */ diff --git a/source4/torture/torture.c b/source4/torture/torture.c index ffd884a38d..3dae9f5863 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -62,7 +62,7 @@ _PUBLIC_ int torture_init(void) #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_smbtorture_MODULES_PROTO; init_module_fn static_init[] = { STATIC_smbtorture_MODULES }; - init_module_fn *shared_init = load_samba_modules(NULL, cmdline_lp_ctx, "smbtorture"); + init_module_fn *shared_init = load_samba_modules(NULL, "smbtorture"); run_init_functions(static_init); run_init_functions(shared_init); diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c index 24c57641f3..d5c385cbc6 100644 --- a/source4/utils/ntlm_auth.c +++ b/source4/utils/ntlm_auth.c @@ -1103,7 +1103,7 @@ int main(int argc, const char **argv) return 1; } - gensec_init(cmdline_lp_ctx); + gensec_init(); if (opt_domain == NULL) { opt_domain = lpcfg_workgroup(cmdline_lp_ctx); -- cgit