svn commit: samba r3721 - in branches/SAMBA_4_0/source/libcli/auth: .

[abartlet at samba.org]

Author: abartlet
Date: 2004-11-13 07:44:50 +0000 (Sat, 13 Nov 2004)
New Revision: 3721

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3721

Log:
We cracked the NTLM2 puzzle long ago, and set the flags elsewhere.
Remove the conditional set.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/auth/gensec_ntlmssp.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/gensec_ntlmssp.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/gensec_ntlmssp.c	2004-11-13 07:22:14 UTC (rev 3720)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec_ntlmssp.c	2004-11-13 07:44:50 UTC (rev 3721)
@@ -186,14 +186,6 @@
 		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 @@
 		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)) {