diff options
| author | Björn Jacke <bj@sernet.de> | 2009-10-28 14:33:40 +0100 |
|---|---|---|
| committer | Björn Jacke <bj@sernet.de> | 2009-10-28 14:45:49 +0100 |
| commit | 0ba004dc7df8b4b3558d7fc4512c9491aa5a646d (patch) | |
| tree | 638486f881c829d5604bba8e07156ce57f9655ee /source3/utils | |
| parent | ee13e9c0becc2b4a4d3b233613d5e3e9bfb54938 (diff) | |
| download | samba-0ba004dc7df8b4b3558d7fc4512c9491aa5a646d.tar.gz samba-0ba004dc7df8b4b3558d7fc4512c9491aa5a646d.tar.bz2 samba-0ba004dc7df8b4b3558d7fc4512c9491aa5a646d.zip | |
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.
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc.c | 8 |
1 files changed, 5 insertions, 3 deletions
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")); }; }; |