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

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  b63a6a1fd6a96bbafd88cacb9493bfea9944d404 (commit)
      from  6dd1582e3583ed3c0766db552a368ddb30af5f7d (commit)

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


- Log -----------------------------------------------------------------
commit b63a6a1fd6a96bbafd88cacb9493bfea9944d404
Author: Volker Lendecke <vl at sernet.de>
Date:   Mon Jul 28 17:52:35 2008 +0200

    Attempt to fix bug 5616
    
    We were calculating the session key but did not return it to the caller...
    (cherry picked from commit 8ab79b1d009d53e414b90e4a0ab8fc7a4889b6df)

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

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 fcce18d..e96d724 100644
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/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) {


-- 
Samba Shared Repository