Changeset 599 for trunk/server/source3/rpc_client

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

Location:

trunk/server/source3/rpc_client

Files:

• cli_pipe.c (modified) (1 diff)
• cli_samr.c (modified) (2 diffs)

trunk/server/source3/rpc_client/cli_pipe.c

@@ -3331 +3331 @@
         }
 
-        status = open_socket_out(&addr, port, 60, &fd);
+        status = open_socket_out(&addr, port, 60*1000, &fd);
         if (!NT_STATUS_IS_OK(status)) {
                 goto fail;

trunk/server/source3/rpc_client/cli_samr.c

@@ -159 +159 @@
         struct lsa_String server, account;
 
+        ZERO_STRUCT(new_nt_password);
+        ZERO_STRUCT(new_lm_password);
+        ZERO_STRUCT(old_nt_hash_enc);
+        ZERO_STRUCT(old_lm_hash_enc);
+
         DEBUG(10,("rpccli_samr_chng_pswd_auth_crap\n"));
 
@@ -164 +169 @@
         init_lsa_String(&account, username);
 
-        memcpy(&new_nt_password.data, new_nt_password_blob.data, 516);
-        memcpy(&new_lm_password.data, new_lm_password_blob.data, 516);
-        memcpy(&old_nt_hash_enc.hash, old_nt_hash_enc_blob.data, 16);
-        memcpy(&old_lm_hash_enc.hash, old_lm_hash_enc_blob.data, 16);
+        if (new_nt_password_blob.data && new_nt_password_blob.length >= 516) {
+                memcpy(&new_nt_password.data, new_nt_password_blob.data, 516);
+        }
+        if (new_lm_password_blob.data && new_lm_password_blob.length >= 516) {
+                memcpy(&new_lm_password.data, new_lm_password_blob.data, 516);
+        }
+        if (old_nt_hash_enc_blob.data && old_nt_hash_enc_blob.length >= 16) {
+                memcpy(&old_nt_hash_enc.hash, old_nt_hash_enc_blob.data, 16);
+        }
+        if (old_lm_hash_enc_blob.data && old_lm_hash_enc_blob.length >= 16) {
+                memcpy(&old_lm_hash_enc.hash, old_lm_hash_enc_blob.data, 16);
+        }
 
         result = rpccli_samr_ChangePasswordUser2(cli, mem_ctx,