From 0ba004dc7df8b4b3558d7fc4512c9491aa5a646d Mon Sep 17 00:00:00 2001 From: Björn Jacke Date: Wed, 28 Oct 2009 14:33:40 +0100 Subject: s3:net: fix output of net rpc trustdom list 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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source3') diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 455405a3ee..f5de1e6966 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -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")); }; }; -- cgit