diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 17:41:37 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:32 +0100 |
| commit | 78416aff6c96a9db9df4f5d4a2907e5afe762748 (patch) | |
| tree | 70e0e6681056602dd6be0c8f0479fc787f784276 /source4/auth/ntlmssp | |
| parent | 133ee7014caecbe2236fa5bf2292a5f8c71e58ef (diff) | |
| download | samba-78416aff6c96a9db9df4f5d4a2907e5afe762748.tar.gz samba-78416aff6c96a9db9df4f5d4a2907e5afe762748.tar.bz2 samba-78416aff6c96a9db9df4f5d4a2907e5afe762748.zip | |
r26258: Use loadparm context in client_start function of gensec.
(This used to be commit bad1891cae2c688b17a6a2b932e754f51291035c)
Diffstat (limited to 'source4/auth/ntlmssp')
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp.h | 1 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_client.c | 29 |
2 files changed, 16 insertions, 14 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h index e39e2d9407..5efc0a2eb1 100644 --- a/source4/auth/ntlmssp/ntlmssp.h +++ b/source4/auth/ntlmssp/ntlmssp.h @@ -184,5 +184,6 @@ struct gensec_ntlmssp_state struct auth_serversupplied_info *server_info; }; +struct loadparm_context; struct auth_session_info; #include "auth/ntlmssp/proto.h" diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c index bff9fc0b8a..49ba6d2409 100644 --- a/source4/auth/ntlmssp/ntlmssp_client.c +++ b/source4/auth/ntlmssp/ntlmssp_client.c @@ -285,7 +285,8 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security, return NT_STATUS_OK; } -NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security) +NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security, + struct loadparm_context *lp_ctx) { struct gensec_ntlmssp_state *gensec_ntlmssp_state; NTSTATUS nt_status; @@ -297,17 +298,17 @@ NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security) gensec_ntlmssp_state->role = NTLMSSP_CLIENT; - gensec_ntlmssp_state->domain = lp_workgroup(global_loadparm); + gensec_ntlmssp_state->domain = lp_workgroup(lp_ctx); - gensec_ntlmssp_state->unicode = lp_parm_bool(global_loadparm, NULL, "ntlmssp_client", "unicode", true); + gensec_ntlmssp_state->unicode = lp_parm_bool(lp_ctx, NULL, "ntlmssp_client", "unicode", true); - gensec_ntlmssp_state->use_nt_response = lp_parm_bool(global_loadparm, NULL, "ntlmssp_client", "send_nt_reponse", true); + gensec_ntlmssp_state->use_nt_response = lp_parm_bool(lp_ctx, NULL, "ntlmssp_client", "send_nt_reponse", true); - gensec_ntlmssp_state->allow_lm_key = (lp_client_lanman_auth(global_loadparm) - && (lp_parm_bool(global_loadparm, NULL, "ntlmssp_client", "allow_lm_key", false) - || lp_parm_bool(global_loadparm, NULL, "ntlmssp_client", "lm_key", false))); + gensec_ntlmssp_state->allow_lm_key = (lp_client_lanman_auth(lp_ctx) + && (lp_parm_bool(lp_ctx, NULL, "ntlmssp_client", "allow_lm_key", false) + || lp_parm_bool(lp_ctx, NULL, "ntlmssp_client", "lm_key", false))); - gensec_ntlmssp_state->use_ntlmv2 = lp_client_ntlmv2_auth(global_loadparm); + gensec_ntlmssp_state->use_ntlmv2 = lp_client_ntlmv2_auth(lp_ctx); gensec_ntlmssp_state->expected_state = NTLMSSP_INITIAL; @@ -315,27 +316,27 @@ NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security) NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_REQUEST_TARGET; - if (lp_parm_bool(global_loadparm, NULL, "ntlmssp_client", "128bit", true)) { + if (lp_parm_bool(lp_ctx, NULL, "ntlmssp_client", "128bit", true)) { gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128; } - if (lp_parm_bool(global_loadparm, NULL, "ntlmssp_client", "56bit", false)) { + if (lp_parm_bool(lp_ctx, NULL, "ntlmssp_client", "56bit", false)) { gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_56; } - if (lp_parm_bool(global_loadparm, NULL, "ntlmssp_client", "lm_key", false)) { + if (lp_parm_bool(lp_ctx, NULL, "ntlmssp_client", "lm_key", false)) { gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_LM_KEY; } - if (lp_parm_bool(global_loadparm, NULL, "ntlmssp_client", "keyexchange", true)) { + if (lp_parm_bool(lp_ctx, NULL, "ntlmssp_client", "keyexchange", true)) { gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_KEY_EXCH; } - if (lp_parm_bool(global_loadparm, NULL, "ntlmssp_client", "alwayssign", true)) { + if (lp_parm_bool(lp_ctx, NULL, "ntlmssp_client", "alwayssign", true)) { gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN; } - if (lp_parm_bool(global_loadparm, NULL, "ntlmssp_client", "ntlm2", true)) { + if (lp_parm_bool(lp_ctx, NULL, "ntlmssp_client", "ntlm2", true)) { gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2; } else { /* apparently we can't do ntlmv2 if we don't do ntlm2 */ |