Changeset 370 for branches/samba-3.3.x/source/utils/net_rpc.c

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

File:

• branches/samba-3.3.x/source/utils/net_rpc.c (modified) (6 diffs)

branches/samba-3.3.x/source/utils/net_rpc.c

@@ -5985 +5985 @@
         struct lsa_DomainList dom_list;
         fstring pdc_name;
+        bool found_domain;
 
         /* trusting domains listing variables */
@@ -6069 +6070 @@
         d_printf("Trusted domains list:\n\n");
 
+        found_domain = false;
+
         do {
                 nt_status = rpccli_lsa_EnumTrustDom(pipe_hnd, mem_ctx,
@@ -6086 +6089 @@
                         print_trusted_domain(dom_list.domains[i].sid,
                                              dom_list.domains[i].name.string);
+                        found_domain = true;
                 };
 
-                /*
-                 * in case of no trusted domains say something rather
-                 * than just display blank line
-                 */
-                if (!dom_list.count) d_printf("none\n");
-
         } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES));
+
+        /*
+         * in case of no trusted domains say something rather
+         * than just display blank line
+         */
+        if (!found_domain) {
+                d_printf("none\n");
+        }
 
         /* close this connection before doing next one */
@@ -6158 +6164 @@
          */
 
+        found_domain = false;
+
         enum_ctx = 0;   /* reset enumeration context from last enumeration */
         do {
@@ -6180 +6188 @@
                         char *str = CONST_DISCARD(char *, trusts->entries[i].name.string);
 
+                        found_domain = true;
+
                         /*
                          * get each single domain's sid (do we _really_ need this ?):
@@ -6225 +6235 @@
                 };
 
-                if (!num_domains) d_printf("none\n");
-
         } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES));
+
+        if (!found_domain) {
+                d_printf("none\n");
+        }
 
         /* close opened samr and domain policy handles */