diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-10 18:41:38 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:13 +0100 |
| commit | 7f0e8252e76b506c8164c14819ca491752bb2526 (patch) | |
| tree | ab37e6f1f673e42e46d1413b65e6ad2d56dcfc82 | |
| parent | eede6b87e1dac018035bb68a675f80d6b25c20e3 (diff) | |
| download | samba-7f0e8252e76b506c8164c14819ca491752bb2526.tar.gz samba-7f0e8252e76b506c8164c14819ca491752bb2526.tar.bz2 samba-7f0e8252e76b506c8164c14819ca491752bb2526.zip | |
r26379: Remove more global_loadparm instances.
(This used to be commit b6f66eb5e00ed01029fa81f408d6154ab01e74e7)
| -rw-r--r-- | source4/auth/auth.c | 10 | ||||
| -rw-r--r-- | source4/auth/gensec/gensec_krb5.c | 2 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp.c | 2 | ||||
| -rw-r--r-- | source4/cluster/ctdb/opendb_ctdb.c | 2 |
4 files changed, 5 insertions, 11 deletions
diff --git a/source4/auth/auth.c b/source4/auth/auth.c index 0068c3bde7..918890b3f6 100644 --- a/source4/auth/auth.c +++ b/source4/auth/auth.c @@ -512,27 +512,21 @@ const struct auth_critical_sizes *auth_interface_version(void) return &critical_sizes; } -NTSTATUS auth_init(struct loadparm_context *lp_ctx) +NTSTATUS auth_init(void) { static bool initialized = false; init_module_fn static_init[] = STATIC_auth_MODULES; - init_module_fn *shared_init; if (initialized) return NT_STATUS_OK; initialized = true; - shared_init = load_samba_modules(NULL, lp_ctx, "auth"); - run_init_functions(static_init); - run_init_functions(shared_init); - - talloc_free(shared_init); return NT_STATUS_OK; } NTSTATUS server_service_auth_init(void) { - return auth_init(global_loadparm); + return auth_init(); } diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index 282be5a001..ca289f24d3 100644 --- a/source4/auth/gensec/gensec_krb5.c +++ b/source4/auth/gensec/gensec_krb5.c @@ -779,7 +779,7 @@ NTSTATUS gensec_krb5_init(void) { NTSTATUS ret; - auth_init(global_loadparm); + auth_init(); ret = gensec_register(&gensec_krb5_security_ops); if (!NT_STATUS_IS_OK(ret)) { diff --git a/source4/auth/ntlmssp/ntlmssp.c b/source4/auth/ntlmssp/ntlmssp.c index e30d1986ee..efb1e63047 100644 --- a/source4/auth/ntlmssp/ntlmssp.c +++ b/source4/auth/ntlmssp/ntlmssp.c @@ -428,7 +428,7 @@ NTSTATUS gensec_ntlmssp_init(void) { NTSTATUS ret; - auth_init(global_loadparm); + auth_init(); ret = gensec_register(&gensec_ntlmssp_security_ops); if (!NT_STATUS_IS_OK(ret)) { diff --git a/source4/cluster/ctdb/opendb_ctdb.c b/source4/cluster/ctdb/opendb_ctdb.c index c8b673e74d..bb8ae26d3d 100644 --- a/source4/cluster/ctdb/opendb_ctdb.c +++ b/source4/cluster/ctdb/opendb_ctdb.c @@ -97,7 +97,7 @@ static struct odb_context *odb_ctdb_init(TALLOC_CTX *mem_ctx, odb->ntvfs_ctx = ntvfs_ctx; /* leave oplocks disabled by default until the code is working */ - odb->oplocks = lp_parm_bool(global_loadparm, NULL, "opendb", "oplocks", false); + odb->oplocks = lp_parm_bool(ntvfs_ctx->lp_ctx, NULL, "opendb", "oplocks", false); return odb; } |