diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-11-20 20:58:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:28:21 -0500 |
| commit | 84c5acc6153548a9c8c99e4f3d5134cdb1397492 (patch) | |
| tree | a5748643d82b92c3a30f5f64186f2415c045c09b | |
| parent | f4c4e0cf7fde6c5b5cffef2e3ad4ec24bb8fb894 (diff) | |
| download | samba-84c5acc6153548a9c8c99e4f3d5134cdb1397492.tar.gz samba-84c5acc6153548a9c8c99e4f3d5134cdb1397492.tar.bz2 samba-84c5acc6153548a9c8c99e4f3d5134cdb1397492.zip | |
r19805: Add the (harmless, but apparently default)
NTLMSSP_NEGOTIATE_ALWAYS_SIGN flags into the default set.
Andrew Bartlett
(This used to be commit 04709c75afda0234c7236fba674bf53a265f8dbb)
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp.c | 4 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_client.c | 4 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_server.c | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp.c b/source4/auth/ntlmssp/ntlmssp.c index 6fbbd7d638..995c2893dc 100644 --- a/source4/auth/ntlmssp/ntlmssp.c +++ b/source4/auth/ntlmssp/ntlmssp.c @@ -261,8 +261,8 @@ void ntlmssp_handle_neg_flags(struct gensec_ntlmssp_state *gensec_ntlmssp_state, gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY; } - if (neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN) { - gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN; + if (!(neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN)) { + gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_ALWAYS_SIGN; } if (!(neg_flags & NTLMSSP_NEGOTIATE_SIGN)) { diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c index 23d96fb90b..5fc7707e68 100644 --- a/source4/auth/ntlmssp/ntlmssp_client.c +++ b/source4/auth/ntlmssp/ntlmssp_client.c @@ -331,6 +331,10 @@ NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security) gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_KEY_EXCH; } + if (lp_parm_bool(-1, "ntlmssp_client", "alwayssign", True)) { + gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN; + } + if (lp_parm_bool(-1, "ntlmssp_client", "ntlm2", True)) { gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2; } else { diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index 31c2ac63f4..93103b9cbd 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -820,6 +820,10 @@ NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security) gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_KEY_EXCH; } + if (lp_parm_bool(-1, "ntlmssp_server", "alwayssign", True)) { + gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN; + } + if (lp_parm_bool(-1, "ntlmssp_server", "ntlm2", True)) { gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2; } |