Changeset 141 for trunk/samba/source/rpc_client

Timestamp:

Aug 7, 2008, 11:49:04 AM (17 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.1

Location:

trunk/samba/source/rpc_client

Files:

• cli_netlogon.c (modified) (4 diffs)
• init_lsa.c (modified) (1 diff)

trunk/samba/source/rpc_client/cli_netlogon.c

@@ -425 +425 @@
         struct netr_ChallengeResponse lm;
         struct netr_ChallengeResponse nt;
-        struct netr_UserSessionKey user_session_key;
-        struct netr_LMSessionKey lmsesskey;
 
         *info3 = NULL;
@@ -501 +499 @@
         }
 
-        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, lmsesskey.key, 8) != 0) {
-                SamOEMhash(lmsesskey.key, cli->dc->sess_key, 8);
+        if (memcmp(zeros, validation.sam3->base.key.key, 16) != 0) {
+                SamOEMhash(validation.sam3->base.key.key,
+                           cli->dc->sess_key, 16);
+        }
+
+        if (memcmp(zeros, validation.sam3->base.LMSessKey.key, 8) != 0) {
+                SamOEMhash(validation.sam3->base.LMSessKey.key,
+                           cli->dc->sess_key, 8);
         }
 
@@ -548 +545 @@
         struct netr_ChallengeResponse lm;
         struct netr_ChallengeResponse nt;
-        struct netr_UserSessionKey user_session_key;
-        struct netr_LMSessionKey lmsesskey;
         uint32_t flags = 0;
 
@@ -621 +616 @@
         }
 
-        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, lmsesskey.key, 8) != 0) {
-                SamOEMhash(lmsesskey.key, cli->dc->sess_key, 8);
+        if (memcmp(zeros, validation.sam3->base.key.key, 16) != 0) {
+                SamOEMhash(validation.sam3->base.key.key,
+                           cli->dc->sess_key, 16);
+        }
+
+        if (memcmp(zeros, validation.sam3->base.LMSessKey.key, 8) != 0) {
+                SamOEMhash(validation.sam3->base.LMSessKey.key,
+                           cli->dc->sess_key, 8);
         }
 

trunk/samba/source/rpc_client/init_lsa.c

@@ -27 +27 @@
 {
         name->string = s;
+
+
 }