diff options
Diffstat (limited to 'auth')
-rw-r--r-- | auth/ntlmssp/gensec_ntlmssp_server.c | 19 | ||||
-rw-r--r-- | auth/ntlmssp/ntlmssp_server.c | 8 |
2 files changed, 8 insertions, 19 deletions
diff --git a/auth/ntlmssp/gensec_ntlmssp_server.c b/auth/ntlmssp/gensec_ntlmssp_server.c index c0e6cff5952..ab92f4d0c09 100644 --- a/auth/ntlmssp/gensec_ntlmssp_server.c +++ b/auth/ntlmssp/gensec_ntlmssp_server.c @@ -179,25 +179,6 @@ NTSTATUS gensec_ntlmssp_server_start(struct gensec_security *gensec_security) ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL; - if (gensec_security->want_features & GENSEC_FEATURE_SESSION_KEY) { - ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; - } - if (gensec_security->want_features & GENSEC_FEATURE_SIGN) { - ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; - - if (gensec_security->want_features & GENSEC_FEATURE_LDAP_STYLE) { - /* - * We need to handle NTLMSSP_NEGOTIATE_SIGN as - * NTLMSSP_NEGOTIATE_SEAL if GENSEC_FEATURE_LDAP_STYLE - * is requested. - */ - ntlmssp_state->force_wrap_seal = true; - } - } - if (gensec_security->want_features & GENSEC_FEATURE_SEAL) { - ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN; - ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL; - } if (role == ROLE_STANDALONE) { ntlmssp_state->server.is_standalone = true; diff --git a/auth/ntlmssp/ntlmssp_server.c b/auth/ntlmssp/ntlmssp_server.c index 37ed2bc9565..140e89daeb1 100644 --- a/auth/ntlmssp/ntlmssp_server.c +++ b/auth/ntlmssp/ntlmssp_server.c @@ -1080,6 +1080,14 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, data_blob_free(&ntlmssp_state->challenge_blob); if (gensec_ntlmssp_have_feature(gensec_security, GENSEC_FEATURE_SIGN)) { + if (gensec_security->want_features & GENSEC_FEATURE_LDAP_STYLE) { + /* + * We need to handle NTLMSSP_NEGOTIATE_SIGN as + * NTLMSSP_NEGOTIATE_SEAL if GENSEC_FEATURE_LDAP_STYLE + * is requested. + */ + ntlmssp_state->force_wrap_seal = true; + } nt_status = ntlmssp_sign_init(ntlmssp_state); } |