diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 16:20:18 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:46:58 +0100 |
| commit | 181aab56d528c3a270ff9f349c8e91ecb402142b (patch) | |
| tree | 678d2acc26d521f331a92a5a531a7ecff11307fe /source4/auth | |
| parent | 4ab0b47ffd812350dce0255d4c654c16da102717 (diff) | |
| download | samba-181aab56d528c3a270ff9f349c8e91ecb402142b.tar.gz samba-181aab56d528c3a270ff9f349c8e91ecb402142b.tar.bz2 samba-181aab56d528c3a270ff9f349c8e91ecb402142b.zip | |
r26221: Add loadparm_context parameter to auth_context_create.
(This used to be commit a9a9634df8f3137ecb308adb90a755f12af94972)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/auth.c | 9 | ||||
| -rw-r--r-- | source4/auth/auth.h | 1 | ||||
| -rw-r--r-- | source4/auth/auth_simple.c | 2 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_server.c | 1 |
4 files changed, 9 insertions, 4 deletions
diff --git a/source4/auth/auth.c b/source4/auth/auth.c index 1dc55de61e..b36f87780c 100644 --- a/source4/auth/auth.c +++ b/source4/auth/auth.c @@ -414,18 +414,19 @@ NTSTATUS auth_context_create_methods(TALLOC_CTX *mem_ctx, const char **methods, NTSTATUS auth_context_create(TALLOC_CTX *mem_ctx, struct event_context *ev, struct messaging_context *msg, + struct loadparm_context *lp_ctx, struct auth_context **auth_ctx) { const char **auth_methods = NULL; - switch (lp_server_role(global_loadparm)) { + switch (lp_server_role(lp_ctx)) { case ROLE_STANDALONE: - auth_methods = lp_parm_string_list(global_loadparm, NULL, "auth methods", "standalone", NULL); + auth_methods = lp_parm_string_list(lp_ctx, NULL, "auth methods", "standalone", NULL); break; case ROLE_DOMAIN_MEMBER: - auth_methods = lp_parm_string_list(global_loadparm, NULL, "auth methods", "member server", NULL); + auth_methods = lp_parm_string_list(lp_ctx, NULL, "auth methods", "member server", NULL); break; case ROLE_DOMAIN_CONTROLLER: - auth_methods = lp_parm_string_list(global_loadparm, NULL, "auth methods", "domain controller", NULL); + auth_methods = lp_parm_string_list(lp_ctx, NULL, "auth methods", "domain controller", NULL); break; } return auth_context_create_methods(mem_ctx, auth_methods, ev, msg, auth_ctx); diff --git a/source4/auth/auth.h b/source4/auth/auth.h index 4e9f7b939f..95819fbaf3 100644 --- a/source4/auth/auth.h +++ b/source4/auth/auth.h @@ -26,6 +26,7 @@ extern const char *user_attrs[]; union netr_Validation; struct netr_SamBaseInfo; struct netr_SamInfo3; +struct loadparm_context; /* modules can use the following to determine if the interface has changed * please increment the version number after each interface change diff --git a/source4/auth/auth_simple.c b/source4/auth/auth_simple.c index 3e07adcb6a..0b94669008 100644 --- a/source4/auth/auth_simple.c +++ b/source4/auth/auth_simple.c @@ -24,6 +24,7 @@ #include "includes.h" #include "auth/auth.h" #include "lib/events/events.h" +#include "param/param.h" /* It's allowed to pass NULL as session_info, @@ -49,6 +50,7 @@ _PUBLIC_ NTSTATUS authenticate_username_pw(TALLOC_CTX *mem_ctx, nt_status = auth_context_create(tmp_ctx, ev, msg, + global_loadparm, &auth_context); if (!NT_STATUS_IS_OK(nt_status)) { talloc_free(tmp_ctx); diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index 79a17e5733..2734c545d8 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -792,6 +792,7 @@ NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security) nt_status = auth_context_create(gensec_ntlmssp_state, gensec_security->event_ctx, gensec_security->msg_ctx, + global_loadparm, &gensec_ntlmssp_state->auth_context); NT_STATUS_NOT_OK_RETURN(nt_status); |