r26234: More global_loadparm fixes.

(This used to be commit 84892d030de6266fc0f3a699cade960dd5dc37bc)

2 files changed, 6 insertions, 6 deletions

diff --git a/source4/client/client.c b/source4/client/client.c
index 571caa68dbd..0006459084e 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -3066,13 +3066,13 @@ static int do_host_query(const char *query_host, const char *workgroup)
 /****************************************************************************
 handle a message operation
 ****************************************************************************/
-static int do_message_op(const char *desthost, const char *destip, int name_type)
+static int do_message_op(const char *netbios_name, const char *desthost, const char *destip, int name_type)
 {
 	struct nbt_name called, calling;
 	const char *server_name;
 	struct smbcli_state *cli;
 
-	make_nbt_name_client(&calling, lp_netbios_name(global_loadparm));
+	make_nbt_name_client(&calling, netbios_name);
 
 	nbt_choose_called_name(NULL, &called, desthost, name_type);
 
@@ -3223,7 +3223,7 @@ static int do_message_op(const char *desthost, const char *destip, int name_type
 	}
 
 	if (message) {
-		return do_message_op(desthost, dest_ip, name_type);
+		return do_message_op(lp_netbios_name(global_loadparm), desthost, dest_ip, name_type);
 	}
 	
 
diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c
index 1a1371edae8..1ac524dd0cb 100644
--- a/source4/client/smbmount.c
+++ b/source4/client/smbmount.c
@@ -111,7 +111,7 @@ static void usr1_handler(int x)
 /***************************************************** 
 return a connection to a server
 *******************************************************/
-static struct smbcli_state *do_connection(char *the_service)
+static struct smbcli_state *do_connection(char *the_service, int maxprotocol)
 {
 	struct smbcli_state *c;
 	struct nmb_name called, calling;
@@ -181,7 +181,7 @@ static struct smbcli_state *do_connection(char *the_service)
 
 	DEBUG(4,("%d: session request ok\n", sys_getpid()));
 
-	if (!smbcli_negprot(c, lp_cli_maxprotocol(global_loadparm))) {
+	if (!smbcli_negprot(c, maxprotocol)) {
 		DEBUG(0,("%d: protocol negotiation failed\n", sys_getpid()));
 		talloc_free(c);
 		return NULL;
@@ -434,7 +434,7 @@ static void init_mount(void)
 	}
 
 
-	c = do_connection(service);
+	c = do_connection(service, lp_cli_maxprotocol(global_loadparm));
 	if (!c) {
 		fprintf(stderr,"SMB connection failed\n");
 		exit(1);