[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2777-g4f62fa5

[Günther Deschner]

The branch, v3-2-test has been updated
       via  4f62fa50c7d542db4a2b8976d85da590194203f0 (commit)
      from  4f5255d1e5025c4c9ebb0b1f22d800e26bcdfb7f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 4f62fa50c7d542db4a2b8976d85da590194203f0
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jul 30 19:03:13 2008 +0200

    rpc_client: Bug 5616 - fix session keys also in rpccli_netr_LogonSamLogonEx wrapper.
    
    Guenther
    (cherry picked from commit fef58091408cce0d7870c86f28f78cf9400cf2b6)

-----------------------------------------------------------------------

Summary of changes:
 source/rpc_client/cli_netlogon.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index 38ff41c..de45e71 100644
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/rpc_client/cli_netlogon.c
@@ -544,8 +544,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;
@@ -617,15 +615,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;


-- 
Samba Shared Repository