Changeset 862 for trunk/server/source3/utils/net_rpc.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/net_rpc.c (modified) (6 diffs)

trunk/server/source3/utils/net_rpc.c

@@ -1657 +1657 @@
                 goto done;
         }
+        if (group_rids.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
+        if (name_types.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
 
         switch (name_types.ids[0])
@@ -2064 +2072 @@
                 goto done;
         }
+        if (rids.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
+        if (rid_types.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
 
         status = dcerpc_samr_OpenGroup(b, mem_ctx,
@@ -2317 +2333 @@
                 d_fprintf(stderr, _("Could not lookup up group member %s\n"),
                           member);
+                goto done;
+        }
+        if (rids.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                goto done;
+        }
+        if (rid_types.count != 1) {
+                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
                 goto done;
         }
@@ -2866 +2890 @@
                         return result;
                 }
-
+                if (names.count != this_time) {
+                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                }
+                if (types.count != this_time) {
+                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                }
                 /* We only have users as members, but make the output
                    the same as the output of alias members */
@@ -3102 +3131 @@
                 d_fprintf(stderr, _("Couldn't find group %s\n"),
                           argv[0]);
-                return result;
-        }
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+        if (rid_types.count != 1) {
+                d_fprintf(stderr, _("Couldn't find group %s\n"),
+                          argv[0]);
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+
 
         if (rid_types.ids[0] == SID_NAME_DOM_GRP) {
@@ -6017 +6052 @@
                            "failed %s\n"),
                         acct_name, nt_errstr(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;
         }