From: Günther Deschner <gd@samba.org>
Date: Wed, 30 Jul 2008 17:03:13 +0000 (+0200)
Subject: rpc_client: Bug 5616 - fix session keys also in rpccli_netr_LogonSamLogonEx wrapper.
X-Git-Tag: samba-3.3.0pre1~358
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fef58091408cce0d7870c86f28f78cf9400cf2b6;p=thirdparty%2Fsamba.git

rpc_client: Bug 5616 - fix session keys also in rpccli_netr_LogonSamLogonEx wrapper.

Guenther
---

diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index e96d724ee9c..df87ed13d13 100644
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/rpc_client/cli_netlogon.c
@@ -453,8 +453,6 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(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;
 	uint32_t flags = 0;
 
 	*info3 = NULL;
@@ -526,15 +524,14 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(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);
 	}
 
 	*info3 = validation.sam3;