From 1979486c8ea9125cb8b16782acc0dcea9c6f552e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 6 Aug 2010 17:51:34 +1000 Subject: s4:ntlmssp Always setup the session keys and signing state While it would save some CPU to only setup the session key when requested (like windows does), this instead matches the implementation in source3/libsmb/ntlmssp.c We could re-add this later after the codebase is merged. Andrew Bartlett --- source4/auth/ntlmssp/ntlmssp_server.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index 9cfc18cd03..ee5f69acd3 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -412,11 +412,6 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, NTSTATUS nt_status; DATA_BLOB session_key = data_blob(NULL, 0); - if (!(gensec_security->want_features - & (GENSEC_FEATURE_SIGN|GENSEC_FEATURE_SEAL|GENSEC_FEATURE_SESSION_KEY))) { - return NT_STATUS_OK; - } - if (user_session_key) dump_data_pw("USER session key:\n", user_session_key->data, user_session_key->length); @@ -525,11 +520,8 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, ntlmssp_state->session_key = session_key; } - if ((gensec_security->want_features & GENSEC_FEATURE_SIGN) - || (gensec_security->want_features & GENSEC_FEATURE_SEAL)) { + if (ntlmssp_state->session_key.length) { nt_status = ntlmssp_sign_init(ntlmssp_state); - } else { - nt_status = NT_STATUS_OK; } ntlmssp_state->expected_state = NTLMSSP_DONE; -- cgit