Changeset 596 for trunk/server/source3/rpc_client/cli_netlogon.c

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/rpc_client/cli_netlogon.c (modified) (7 diffs)

trunk/server/source3/rpc_client/cli_netlogon.c

@@ -284 +284 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /**
@@ -299 +385 @@
                                            const char *workstation,
                                            const uint8 chal[8],
+
                                            DATA_BLOB lm_response,
                                            DATA_BLOB nt_response,
@@ -304 +391 @@
 {
         NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-        int validation_level = 3;
         const char *workstation_name_slash;
         const char *server_name_slash;
@@ -398 +484 @@
         netlogon_creds_decrypt_samlogon(cli->dc, validation_level, &validation);
 
-        *info3 = validation.sam3;
+        result = map_validation_to_info3(mem_ctx, validation_level, &validation, info3);
+        if (!NT_STATUS_IS_OK(result)) {
+                return result;
+        }
 
         return result;
@@ -411 +500 @@
                                               const char *workstation,
                                               const uint8 chal[8],
+
                                               DATA_BLOB lm_response,
                                               DATA_BLOB nt_response,
@@ -416 +506 @@
 {
         NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-        int validation_level = 3;
         const char *workstation_name_slash;
         const char *server_name_slash;
@@ -499 +588 @@
         netlogon_creds_decrypt_samlogon(cli->dc, validation_level, &validation);
 
-        *info3 = validation.sam3;
+        result = map_validation_to_info3(mem_ctx, validation_level, &validation, info3);
+        if (!NT_STATUS_IS_OK(result)) {
+                return result;
+        }
 
         return result;