Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel

(This used to be commit e038f1cf9fb305fc1e7a4189208e451d30aaa1f0)

3 files changed, 8 insertions, 8 deletions

diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index c01aace8f5..c0922efe6b 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -219,7 +219,7 @@ NTSTATUS rpc_vampire_ldif_internals(struct net_context *c,
 int rpc_vampire_ldif(struct net_context *c, int argc, const char **argv)
 {
 	if (c->display_usage) {
-		d_printf("Usage\n"
+		d_printf("Usage:\n"
 			 "net rpc vampire ldif\n"
 			 "    Dump remote SAM database to LDIF file or stdout\n");
 		return 0;
@@ -343,7 +343,7 @@ int rpc_vampire_keytab(struct net_context *c, int argc, const char **argv)
 	int ret = 0;
 
 	if (c->display_usage) {
-		d_printf("Usage\n"
+		d_printf("Usage:\n"
 			 "net rpc vampire keytab\n"
 			 "    Dump remote SAM database to Kerberos keytab file\n");
 		return 0;
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index eb39c739e7..88850d29df 100644
--- a/source3/utils/net_util.c
+++ b/source3/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;
 		}
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 6699763cd2..750030d916 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1228,9 +1228,9 @@ static struct server_id parse_dest(const char *dest)
 	struct server_id result = {-1};
 	pid_t pid;
 
-	/* Zero is a special return value for broadcast smbd */
+	/* Zero is a special return value for broadcast to all processes */
 
-	if (strequal(dest, "smbd")) {
+	if (strequal(dest, "all")) {
 		return interpret_pid(MSG_BROADCAST_PID_STR);
 	}
 
@@ -1245,7 +1245,6 @@ static struct server_id parse_dest(const char *dest)
 		dest = "winbindd";
 	}
 
-	
 	if (!(strequal(dest, "winbindd") || strequal(dest, "nmbd"))) {
 		/* Check for numeric pid number */
 
@@ -1266,7 +1265,7 @@ static struct server_id parse_dest(const char *dest)
 	fprintf(stderr,"Can't find pid for destination '%s'\n", dest);
 
 	return result;
-}	
+}
 
 /* Execute smbcontrol command */