summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@sernet.de>2008-07-28 17:52:35 +0200
committerVolker Lendecke <vl@samba.org>2008-07-28 18:07:01 +0200
commit91df5551a416d59756e7110247b0155621580bae (patch)
tree7e188fbad3cac970b099c7177be93b5c438f61cc
parentd6b7f800d3d6ce6c9336498d7ec9b825c28b6c42 (diff)
downloadsamba-91df5551a416d59756e7110247b0155621580bae.tar.gz
samba-91df5551a416d59756e7110247b0155621580bae.tar.bz2
samba-91df5551a416d59756e7110247b0155621580bae.zip
Attempt to fix bug 5616
We were calculating the session key but did not return it to the caller... (cherry picked from commit 8ab79b1d009d53e414b90e4a0ab8fc7a4889b6df) (This used to be commit b63a6a1fd6a96bbafd88cacb9493bfea9944d404)
-rw-r--r--source3/rpc_client/cli_netlogon.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index fcce18dfc0..e96d724ee9 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -333,8 +333,6 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
union netr_Validation validation;
struct netr_ChallengeResponse lm;
struct netr_ChallengeResponse nt;
- struct netr_UserSessionKey user_session_key;
- struct netr_LMSessionKey lmsesskey;
*info3 = NULL;
@@ -409,15 +407,14 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
return result;
}
- user_session_key = validation.sam3->base.key;
- lmsesskey = validation.sam3->base.LMSessKey;
-
- if (memcmp(zeros, user_session_key.key, 16) != 0) {
- SamOEMhash(user_session_key.key, cli->dc->sess_key, 16);
+ if (memcmp(zeros, validation.sam3->base.key.key, 16) != 0) {
+ SamOEMhash(validation.sam3->base.key.key,
+ cli->dc->sess_key, 16);
}
- if (memcmp(zeros, lmsesskey.key, 8) != 0) {
- SamOEMhash(lmsesskey.key, cli->dc->sess_key, 8);
+ if (memcmp(zeros, validation.sam3->base.LMSessKey.key, 8) != 0) {
+ SamOEMhash(validation.sam3->base.LMSessKey.key,
+ cli->dc->sess_key, 8);
}
if (memcmp(zeros, ret_creds.cred.data, sizeof(ret_creds.cred.data)) != 0) {