diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-07-12 00:02:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:10:03 -0500 |
| commit | 51de50de292df3af48a68366eef4ee526ceb801d (patch) | |
| tree | 03cb88c3995c8e57599ed1d5480cd58cd80276ca /source4/auth/ntlmssp/ntlmssp.c | |
| parent | 571052fec8767d7b9005512d61d4687d40e465e8 (diff) | |
| download | samba-51de50de292df3af48a68366eef4ee526ceb801d.tar.gz samba-51de50de292df3af48a68366eef4ee526ceb801d.tar.bz2 samba-51de50de292df3af48a68366eef4ee526ceb801d.zip | |
r16961: Merge 'seperate policy from logic' changes from Samba3. The 56-bit
flag is handled just like all the others.
Also negotiate the unknown 0x02000000 flag, to match windows.
Andrew Bartlett
(This used to be commit 1d0befdb681ed9974d1bdff46ce56353552ee0e0)
Diffstat (limited to 'source4/auth/ntlmssp/ntlmssp.c')
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp.c b/source4/auth/ntlmssp/ntlmssp.c index fff0c9c7e9..bb9ff9cc63 100644 --- a/source4/auth/ntlmssp/ntlmssp.c +++ b/source4/auth/ntlmssp/ntlmssp.c @@ -260,9 +260,6 @@ void ntlmssp_handle_neg_flags(struct gensec_ntlmssp_state *gensec_ntlmssp_state, if (!(neg_flags & NTLMSSP_NEGOTIATE_128)) { gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_128; - if (neg_flags & NTLMSSP_NEGOTIATE_56) { - gensec_ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_56; - } } if (!(neg_flags & NTLMSSP_NEGOTIATE_56)) { @@ -273,6 +270,12 @@ void ntlmssp_handle_neg_flags(struct gensec_ntlmssp_state *gensec_ntlmssp_state, gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_KEY_EXCH; } + /* Woop Woop - unknown flag for Windows compatibility... + What does this really do ? JRA. */ + if (!(neg_flags & NTLMSSP_UNKNOWN_02000000)) { + gensec_ntlmssp_state->neg_flags &= ~NTLMSSP_UNKNOWN_02000000; + } + if ((neg_flags & NTLMSSP_REQUEST_TARGET)) { gensec_ntlmssp_state->neg_flags |= NTLMSSP_REQUEST_TARGET; } |