[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  0ba004d... s3:net: fix output of net rpc trustdom list
      from  ee13e9c... s3:configure: only check for gpfs_gpl.h

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0ba004dc7df8b4b3558d7fc4512c9491aa5a646d
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Oct 28 14:33:40 2009 +0100

    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.

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/net_rpc.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 455405a..f5de1e6 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"));
 			};
 		};
 


-- 
Samba Shared Repository