Changeset 860 for vendor/current/source3/libnet

Timestamp:

May 12, 2014, 8:58:38 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

File:

• vendor/current/source3/libnet/libnet_join.c (modified) (5 diffs)

vendor/current/source3/libnet/libnet_join.c

@@ -851 +851 @@
         union samr_UserInfo user_info;
         struct dcerpc_binding_handle *b = NULL;
+        unsigned int old_timeout = 0;
 
         struct samr_CryptPassword crypt_pwd;
@@ -997 +998 @@
                 goto done;
         }
+        if (user_rids.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
+        if (name_types.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
 
         if (name_types.ids[0] != SID_NAME_USER) {
@@ -1062 +1071 @@
         /* Set password on machine account - first try level 26 */
 
+        /*
+         * increase the timeout as password filter modules on the DC
+         * might delay the operation for a significant amount of time
+         */
+        old_timeout = rpccli_set_timeout(pipe_hnd, 600000);
+
         init_samr_CryptPasswordEx(r->in.machine_password,
                                   &cli->user_session_key,
@@ -1092 +1107 @@
                                                   &result);
         }
+
+        old_timeout = rpccli_set_timeout(pipe_hnd, old_timeout);
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -1366 +1383 @@
         if (!NT_STATUS_IS_OK(result)) {
                 status = result;
+                goto done;
+        }
+        if (user_rids.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
+        if (name_types.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
                 goto done;
         }