summaryrefslogtreecommitdiff
path: root/source4/auth/ntlmssp
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-08-06 17:51:34 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-08-07 18:39:47 +1000
commit1979486c8ea9125cb8b16782acc0dcea9c6f552e (patch)
treebf587fe0f2f24b5f65088a9dc2b188c12430f9a0 /source4/auth/ntlmssp
parentb03bc8822b5282fa1acd8e3a90b1424656fced4c (diff)
downloadsamba-1979486c8ea9125cb8b16782acc0dcea9c6f552e.tar.gz
samba-1979486c8ea9125cb8b16782acc0dcea9c6f552e.tar.bz2
samba-1979486c8ea9125cb8b16782acc0dcea9c6f552e.zip
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
Diffstat (limited to 'source4/auth/ntlmssp')
-rw-r--r--source4/auth/ntlmssp/ntlmssp_server.c10
1 files changed, 1 insertions, 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;