diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 23:33:16 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:53 +0100 |
| commit | da0f222f432c4fc8bf5da80baf849ca32b315ca0 (patch) | |
| tree | 3af5624aca9ce68b4b169ed1066dd03e8b2e7d9d /source4/client | |
| parent | 5b357ca8774d97e85153151552bc052cfaf26c1b (diff) | |
| download | samba-da0f222f432c4fc8bf5da80baf849ca32b315ca0.tar.gz samba-da0f222f432c4fc8bf5da80baf849ca32b315ca0.tar.bz2 samba-da0f222f432c4fc8bf5da80baf849ca32b315ca0.zip | |
r26271: Remove some more uses of global_loadparm.
(This used to be commit e9875fcd56de0748ed78d7e3c9cdb4919cd96d3c)
Diffstat (limited to 'source4/client')
| -rw-r--r-- | source4/client/client.c | 6 | ||||
| -rw-r--r-- | source4/client/smbmount.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index a2fe29fc60..6debaac2e9 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -3066,7 +3066,7 @@ static int do_host_query(const char *query_host, const char *workgroup) /**************************************************************************** handle a message operation ****************************************************************************/ -static int do_message_op(const char *netbios_name, 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, const char **name_resolve_order, int max_xmit, int max_mux) { struct nbt_name called, calling; const char *server_name; @@ -3078,7 +3078,7 @@ static int do_message_op(const char *netbios_name, const char *desthost, const c server_name = destip ? destip : desthost; - if (!(cli=smbcli_state_init(NULL)) || !smbcli_socket_connect(cli, server_name, lp_name_resolve_order(global_loadparm), lp_max_xmit(global_loadparm), lp_maxmux(global_loadparm))) { + if (!(cli=smbcli_state_init(NULL)) || !smbcli_socket_connect(cli, server_name, name_resolve_order, max_xmit, max_mux)) { d_printf("Connection to %s failed\n", server_name); return 1; } @@ -3223,7 +3223,7 @@ static int do_message_op(const char *netbios_name, const char *desthost, const c } if (message) { - return do_message_op(lp_netbios_name(global_loadparm), desthost, dest_ip, name_type); + return do_message_op(lp_netbios_name(global_loadparm), desthost, dest_ip, name_type, lp_name_resolve_order(global_loadparm), lp_max_xmit(global_loadparm), lp_maxmux(global_loadparm)); } diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c index 8c0a6fcdf1..db16c6cf1f 100644 --- a/source4/client/smbmount.c +++ b/source4/client/smbmount.c @@ -406,7 +406,9 @@ static void send_fs_socket(const char *the_service, const char *mount_point, str CatchSignal(SIGUSR1, &usr1_handler); pause(); DEBUG(2,("mount.smbfs[%d]: got signal, getting new socket\n", sys_getpid())); - c = do_connection(the_service, lp_unicode(global_loadparm), lp_cli_maxprotocol(global_loadparm)); + c = do_connection(the_service, + lp_unicode(global_loadparm), + lp_cli_maxprotocol(global_loadparm)); } } |