summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-01-05 12:36:21 +0000
committerAndrew Bartlett <abartlet@samba.org>2004-01-05 12:36:21 +0000
commited55d03c8a087b9a3df9764d3c983bf59af1defc (patch)
treeee671d9b24d1d9d3602944d1d8e258bde4cfdfd0
parentad390f9336b5000a7225ed08942cbbd218cc349a (diff)
downloadsamba-ed55d03c8a087b9a3df9764d3c983bf59af1defc.tar.gz
samba-ed55d03c8a087b9a3df9764d3c983bf59af1defc.tar.bz2
samba-ed55d03c8a087b9a3df9764d3c983bf59af1defc.zip
Don't free the encrypted_session_key early - that causes the subsequent
test for a valid length to fail... This should fix 'security=server' and hosts-equiv failures picked up by the build farm. Andrew Bartlett (This used to be commit 39311495de3bd0a902f730967f30176db97be05a)
-rw-r--r--source3/libsmb/ntlmssp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 85ae279758..0ab51dc960 100644
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -708,7 +708,6 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
DEBUG(10,("ntlmssp_server_auth: Using unmodified lm session key.\n"));
dump_data_pw("unmodified session key:\n", session_key.data, session_key.length);
} else {
- data_blob_free(&encrypted_session_key);
DEBUG(10,("ntlmssp_server_auth: Failed to create unmodified session key.\n"));
session_key = data_blob(NULL, 0);
}
@@ -724,6 +723,7 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
} else if (!session_key.data || session_key.length != 16) {
DEBUG(5, ("server session key is invalid (len == %u), cannot do KEY_EXCH!\n",
session_key.length));
+ ntlmssp_state->session_key = session_key;
} else {
dump_data_pw("KEY_EXCH session key (enc):\n", encrypted_session_key.data, encrypted_session_key.length);
SamOEMhash(encrypted_session_key.data,