s3:net: fix output of net rpc trustdom list
authorBjörn Jacke <bj@sernet.de>
Wed, 28 Oct 2009 13:33:40 +0000 (14:33 +0100)
committerBjörn Jacke <bj@sernet.de>
Wed, 28 Oct 2009 13:45:49 +0000 (14:45 +0100)
Move some messages from stderr to stdout. When some trusting DCs were
unreachable we lacked \n's on stdout which screwed up whole the output.

source3/utils/net_rpc.c

index 455405a3ee899a37a691bbb3cb5227e349f31959..f5de1e69662017938598050c746c4d9013ee6d50 100644 (file)
@@ -5770,7 +5770,9 @@ static NTSTATUS rpc_query_domain_sid(struct net_context *c,
                                        const char **argv)
 {
        fstring str_sid;
-       sid_to_fstring(str_sid, domain_sid);
+       if (!sid_to_fstring(str_sid, domain_sid)) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
        d_printf("%s\n", str_sid);
        return NT_STATUS_OK;
 }
@@ -6239,8 +6241,7 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
                                            &ndr_table_lsarpc.syntax_id, 0,
                                            rpc_query_domain_sid, argc,
                                            argv))
-                                       d_fprintf(stderr,
-                                             _("couldn't get domain's sid\n"));
+                                       d_printf(_("strange - couldn't get domain's sid\n"));
 
                                cli_shutdown(remote_cli);
 
@@ -6248,6 +6249,7 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
                                d_fprintf(stderr, _("domain controller is not "
                                          "responding: %s\n"),
                                          nt_errstr(nt_status));
+                               d_printf(_("couldn't get domain's sid\n"));
                        };
                };