Changeset 862 for trunk/server/source3/rpcclient/cmd_lsarpc.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/rpcclient/cmd_lsarpc.c (modified) (4 diffs)

trunk/server/source3/rpcclient/cmd_lsarpc.c

@@ -324 +324 @@
         uint32_t num_names;
         struct lsa_String *names;
-        struct lsa_RefDomainList *domains;
+        struct lsa_RefDomainList *domains = NULL;
         struct lsa_TransSidArray3 sids;
         uint32_t count = 0;
@@ -362 +362 @@
         }
 
+        if (sids.count != num_names) {
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+
         for (i = 0; i < sids.count; i++) {
                 fstring sid_str;
@@ -451 +455 @@
         int i;
         struct lsa_SidArray sids;
-        struct lsa_RefDomainList *domains;
+        struct lsa_RefDomainList *domains = NULL;
         struct lsa_TransNameArray2 names;
         uint32_t count = 0;
@@ -507 +511 @@
         /* Print results */
 
-        for (i = 0; i < count; i++) {
+        for (i = 0; i < names.count; i++) {
                 fstring sid_str;
 
+                if (i >= sids.num_sids) {
+                        break;
+                }
                 sid_to_fstring(sid_str, sids.sids[i].sid);
                 printf("%s %s (%d)\n", sid_str,