sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

auth/ntlmssp: define all client neg_flags in gensec_ntlmssp_client_start()

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
This commit is contained in:
Stefan Metzmacher 2015-12-01 11:01:24 +01:00
parent 30d626024c
commit afba38dbf5
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
auth/ntlmssp/ntlmssp_client.c
View File

@ -71,16 +71,6 @@ NTSTATUS ntlmssp_client_initial(struct gensec_security *gensec_security,
workstation = ""; workstation = "";
} }
if (ntlmssp_state->unicode) {
ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
} else {
ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_OEM;
}
if (ntlmssp_state->use_ntlmv2) {
ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;
}
/* generate the ntlmssp negotiate packet */ /* generate the ntlmssp negotiate packet */
status = msrpc_gen(out_mem_ctx, status = msrpc_gen(out_mem_ctx,
out, "CddAA", out, "CddAA",
@ -604,6 +594,12 @@ NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security)
NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_NTLM |
NTLMSSP_REQUEST_TARGET; NTLMSSP_REQUEST_TARGET;
if (ntlmssp_state->unicode) {
ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
} else {
ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_OEM;
}
if (gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "128bit", true)) { if (gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "128bit", true)) {
ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128; ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_128;
} }
@ -631,6 +627,10 @@ NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security)
ntlmssp_state->use_ntlmv2 = false; ntlmssp_state->use_ntlmv2 = false;
} }
if (ntlmssp_state->use_ntlmv2) {
ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;
}
if (gensec_security->want_features & GENSEC_FEATURE_SESSION_KEY) { if (gensec_security->want_features & GENSEC_FEATURE_SESSION_KEY) {
/* /*
* We need to set this to allow a later SetPassword * We need to set this to allow a later SetPassword