From: Stefan Metzmacher Date: Wed, 20 Apr 2016 16:44:21 +0000 (+0200) Subject: auth/ntlmssp: don't require any flags in the ccache_resume code X-Git-Tag: samba-4.2.12~27 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=9dc49c9d3322da89d2de208a2472604c49b3ada1 auth/ntlmssp: don't require any flags in the ccache_resume code ntlmssp_client_challenge() already checks for required flags before asking winbindd. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11850 Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider Reviewed-by: Günther Deschner (cherry picked from commit 5041adb6657596399049a33e6a739a040b4df0db) --- diff --git a/auth/ntlmssp/ntlmssp_client.c b/auth/ntlmssp/ntlmssp_client.c index b4196157c81..8b367fc401e 100644 --- a/auth/ntlmssp/ntlmssp_client.c +++ b/auth/ntlmssp/ntlmssp_client.c @@ -172,19 +172,14 @@ NTSTATUS gensec_ntlmssp_resume_ccache(struct gensec_security *gensec_security, if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN) { gensec_security->want_features |= GENSEC_FEATURE_SIGN; - - ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SIGN; } if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL) { gensec_security->want_features |= GENSEC_FEATURE_SEAL; - - ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SIGN; - ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SEAL; } - ntlmssp_state->neg_flags |= ntlmssp_state->required_flags; ntlmssp_state->conf_flags = ntlmssp_state->neg_flags; + ntlmssp_state->required_flags = 0; if (DEBUGLEVEL >= 10) { struct NEGOTIATE_MESSAGE *negotiate = talloc(