[SCM] Samba Shared Repository - branch v3-5-test updated

[Björn Jacke]

The branch, v3-5-test has been updated
       via  83344b3... s3:net: fix output of net rpc trustdom list
      from  a227073... Fix bug 6572 - libsmbclient: unable to access 'msdfs proxy' share.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 83344b34d16e431ca8030585b383db1414154981
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 0e325b5..b06f62a 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;
 }
@@ -6245,8 +6247,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);
 
@@ -6254,6 +6255,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