diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 16:20:25 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:46:58 +0100 |
| commit | 3b281c308111323600af4ed44af372d7ceb0b25b (patch) | |
| tree | 56a1cd9ac3726c9739c7b617c7a09659693814df /source4/auth | |
| parent | 181aab56d528c3a270ff9f349c8e91ecb402142b (diff) | |
| download | samba-3b281c308111323600af4ed44af372d7ceb0b25b.tar.gz samba-3b281c308111323600af4ed44af372d7ceb0b25b.tar.bz2 samba-3b281c308111323600af4ed44af372d7ceb0b25b.zip | |
r26222: Avoid global_loadparm in a couple more places.
(This used to be commit 5bd053a570ec0a783b4dcd943698263925f819f9)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/auth.c | 6 | ||||
| -rw-r--r-- | source4/auth/gensec/gensec_krb5.c | 2 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source4/auth/auth.c b/source4/auth/auth.c index b36f87780c..e4af53d25e 100644 --- a/source4/auth/auth.c +++ b/source4/auth/auth.c @@ -510,7 +510,7 @@ const struct auth_critical_sizes *auth_interface_version(void) return &critical_sizes; } -NTSTATUS auth_init(void) +NTSTATUS auth_init(struct loadparm_context *lp_ctx) { static bool initialized = false; @@ -520,7 +520,7 @@ NTSTATUS auth_init(void) if (initialized) return NT_STATUS_OK; initialized = true; - shared_init = load_samba_modules(NULL, global_loadparm, "auth"); + shared_init = load_samba_modules(NULL, lp_ctx, "auth"); run_init_functions(static_init); run_init_functions(shared_init); @@ -532,5 +532,5 @@ NTSTATUS auth_init(void) NTSTATUS server_service_auth_init(void) { - return auth_init(); + return auth_init(global_loadparm); } diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c index ca48e85089..8ce941719f 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(); + auth_init(global_loadparm); 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 f957ac9dbd..e30d1986ee 100644 --- a/source4/auth/ntlmssp/ntlmssp.c +++ b/source4/auth/ntlmssp/ntlmssp.c @@ -28,6 +28,7 @@ #include "auth/credentials/credentials.h" #include "auth/gensec/gensec.h" #include "auth/auth.h" +#include "param/param.h" /** * Callbacks for NTLMSSP - for both client and server operating modes @@ -427,7 +428,7 @@ NTSTATUS gensec_ntlmssp_init(void) { NTSTATUS ret; - auth_init(); + auth_init(global_loadparm); ret = gensec_register(&gensec_ntlmssp_security_ops); if (!NT_STATUS_IS_OK(ret)) { |