diff options
Diffstat (limited to 'source4/client')
-rw-r--r-- | source4/client/cifsdd.c | 4 | ||||
-rw-r--r-- | source4/client/client.c | 4 | ||||
-rw-r--r-- | source4/client/smbmount.c | 2 | ||||
-rw-r--r-- | source4/client/smbspool.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c index cb42e992ce..b4407a7902 100644 --- a/source4/client/cifsdd.c +++ b/source4/client/cifsdd.c @@ -429,7 +429,7 @@ static int copy_files(void) set_max_xmit(MAX(ibs, obs)); DEBUG(4, ("IO buffer size is %llu, max xmit is %d\n", - (unsigned long long)iomax, lp_max_xmit())); + (unsigned long long)iomax, lp_max_xmit(global_loadparm))); if (!(ifile = open_file("if"))) { return(FILESYS_EXIT_CODE); @@ -443,7 +443,7 @@ static int copy_files(void) ifile->io_seek(ifile, check_arg_numeric("skip") * ibs); ofile->io_seek(ofile, check_arg_numeric("seek") * obs); - DEBUG(4, ("max xmit was negotiated to be %d\n", lp_max_xmit())); + DEBUG(4, ("max xmit was negotiated to be %d\n", lp_max_xmit(global_loadparm))); for (data_size = 0;;) { diff --git a/source4/client/client.c b/source4/client/client.c index f63315a05b..60030a1d27 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -3072,7 +3072,7 @@ static int do_message_op(const char *desthost, const char *destip, int name_type const char *server_name; struct smbcli_state *cli; - make_nbt_name_client(&calling, lp_netbios_name()); + make_nbt_name_client(&calling, lp_netbios_name(global_loadparm)); nbt_choose_called_name(NULL, &called, desthost, name_type); @@ -3219,7 +3219,7 @@ static int do_message_op(const char *desthost, const char *destip, int name_type } if (query_host) { - return do_host_query(query_host, lp_workgroup()); + return do_host_query(query_host, lp_workgroup(global_loadparm)); } if (message) { diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c index 7bd42b84cf..9d505be4a6 100644 --- a/source4/client/smbmount.c +++ b/source4/client/smbmount.c @@ -893,7 +893,7 @@ static void parse_mount_smb(int argc, char **argv) pstrcpy(username,getenv("LOGNAME")); } - if (!lp_load()) { + if (!lp_load(dyn_CONFIGFILE)) { fprintf(stderr, "Can't load %s - run testparm to debug it\n", lp_config_file()); } diff --git a/source4/client/smbspool.c b/source4/client/smbspool.c index 45407b1acc..7270942037 100644 --- a/source4/client/smbspool.c +++ b/source4/client/smbspool.c @@ -176,7 +176,7 @@ static int smb_print(struct smbcli_state *, char *, FILE *); setup_logging(argv[0], DEBUG_STDOUT); - if (!lp_load()) { + if (!lp_load(dyn_CONFIGFILE)) { fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", lp_config_file()); return (1); } |