Changeset 862 for trunk/server/source4/libcli/util/clilsa.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)
• source4/libcli/util/clilsa.c (modified) (2 diffs)

trunk/server/source4/libcli/util/clilsa.c

@@ -255 +255 @@
         if (names.count != 1) {
                 talloc_free(mem_ctx2);
-                return NT_STATUS_UNSUCCESSFUL;
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+        if (domains == NULL) {
+                talloc_free(mem_ctx2);
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+        if (domains->count != 1) {
+                talloc_free(mem_ctx2);
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+        if (names.names[0].sid_index != UINT32_MAX &&
+            names.names[0].sid_index >= domains->count)
+        {
+                talloc_free(mem_ctx2);
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
         }
 
@@ -316 +330 @@
         if (sids.count != 1) {
                 talloc_free(mem_ctx2);
-                return NT_STATUS_UNSUCCESSFUL;
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+        if (domains->count != 1) {
+                talloc_free(mem_ctx2);
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
         }