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)

diff --git a/source4/libcli/auth/gensec_ntlmssp.c b/source4/libcli/auth/gensec_ntlmssp.c
index c033705f10f9d839aa91a6c7dd7b3dfc9b6aaaf8..e774efe94e39d5cde6f8d6af8beef3a46d5e9277 100644 (file)
--- 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)) {