summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-11-13 07:44:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:46 -0500
commit2f8804631d9b26dbc58a385788764b1cbb74ce91 (patch)
treefd69fc69be0fafd253c5c117e677baa999ca6294
parenta1a05543dc12b2414b74dcbe16231992f1104acd (diff)
downloadsamba-2f8804631d9b26dbc58a385788764b1cbb74ce91.tar.gz
samba-2f8804631d9b26dbc58a385788764b1cbb74ce91.tar.bz2
samba-2f8804631d9b26dbc58a385788764b1cbb74ce91.zip
r3721: We cracked the NTLM2 puzzle long ago, and set the flags elsewhere.
Remove the conditional set. Andrew Bartlett (This used to be commit f5d8a4dde58a88408892501fd3ce53f19e67f1f1)
-rw-r--r--source4/libcli/auth/gensec_ntlmssp.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/source4/libcli/auth/gensec_ntlmssp.c b/source4/libcli/auth/gensec_ntlmssp.c
index c033705f10..e774efe94e 100644
--- a/source4/libcli/auth/gensec_ntlmssp.c
+++ b/source4/libcli/auth/gensec_ntlmssp.c
@@ -186,14 +186,6 @@ static NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_secur
gensec_ntlmssp_state->ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
}
- /* IF we are not doing Signing or Sealing, we can actually do
- * NTLM2. When we crack the crypto puzzle, then we can enable
- * this always, in the constant flags */
-
- if (!(gensec_security->want_features & GENSEC_WANT_SIGN) && !(gensec_security->want_features & GENSEC_WANT_SEAL)) {
- gensec_ntlmssp_state->ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;
- }
-
ntlmssp_state = gensec_ntlmssp_state->ntlmssp_state;
nt_status = make_auth_context_subsystem(gensec_security, &gensec_ntlmssp_state->auth_context);
if (!NT_STATUS_IS_OK(nt_status)) {
@@ -247,14 +239,6 @@ static NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_secur
gensec_ntlmssp_state->ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
}
- /* IF we are not doing Signing or Sealing, we can actually do
- * NTLM2. When we crack the crypto puzzle, then we can enable
- * this always, in the constant flags */
-
- if (!(gensec_security->want_features & GENSEC_WANT_SIGN) && !(gensec_security->want_features & GENSEC_WANT_SEAL)) {
- gensec_ntlmssp_state->ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;
- }
-
status = ntlmssp_set_domain(gensec_ntlmssp_state->ntlmssp_state,
gensec_security->user.domain);
if (!NT_STATUS_IS_OK(status)) {