[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3798-g15e8df7

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  15e8df7dd619c70f1360585a383c131708ce0ceb (commit)
       via  d0e6c07316aa8ed6d54df2050fbee252f5d2e4f3 (commit)
      from  6fc73f4e5e11c5784687015f10d9247412f0c8d4 (commit)

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


- Log -----------------------------------------------------------------
commit 15e8df7dd619c70f1360585a383c131708ce0ceb
Merge: d0e6c07316aa8ed6d54df2050fbee252f5d2e4f3 6fc73f4e5e11c5784687015f10d9247412f0c8d4
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Aug 21 15:27:45 2008 -0700

    Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test

commit d0e6c07316aa8ed6d54df2050fbee252f5d2e4f3
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Aug 21 15:26:39 2008 -0700

    Fix broken net rpc join message when DC can't be found. Ensure we pass in a domain name.
    Jeremy.

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

Summary of changes:
 source/utils/net_util.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net_util.c b/source/utils/net_util.c
index eb39c73..88850d2 100644
--- a/source/utils/net_util.c
+++ b/source/utils/net_util.c
@@ -476,7 +476,7 @@ bool net_find_pdc(struct sockaddr_storage *server_ss,
 NTSTATUS net_make_ipc_connection(struct net_context *c, unsigned flags,
 				 struct cli_state **pcli)
 {
-	return net_make_ipc_connection_ex(c, NULL, NULL, NULL, flags, pcli);
+	return net_make_ipc_connection_ex(c, c->opt_workgroup, NULL, NULL, flags, pcli);
 }
 
 NTSTATUS net_make_ipc_connection_ex(struct net_context *c ,const char *domain,
@@ -492,7 +492,8 @@ NTSTATUS net_make_ipc_connection_ex(struct net_context *c ,const char *domain,
 	if ( !server || !pss ) {
 		if (!net_find_server(c, domain, flags, &server_ss,
 				     &server_name)) {
-			d_fprintf(stderr, "Unable to find a suitable server\n");
+			d_fprintf(stderr, "Unable to find a suitable server "
+				"for domain %s\n", domain);
 			nt_status = NT_STATUS_UNSUCCESSFUL;
 			goto done;
 		}


-- 
Samba Shared Repository