summaryrefslogtreecommitdiff
path: root/source4/client
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-04 01:51:36 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:03 +0100
commit9ebcd7a0df117158f1817b7d3a9a21ad4e1fa97a (patch)
treeb42e57b02397f6ae230282cc76161f502f9e8b2b /source4/client
parent71ae20df2c7e346c4b115bbed7c579c881369fdb (diff)
downloadsamba-9ebcd7a0df117158f1817b7d3a9a21ad4e1fa97a.tar.gz
samba-9ebcd7a0df117158f1817b7d3a9a21ad4e1fa97a.tar.bz2
samba-9ebcd7a0df117158f1817b7d3a9a21ad4e1fa97a.zip
r26277: Move loadparm context higher up the stack.
(This used to be commit 38fa08310ce573e9b46e76c840ddda6f18863573)
Diffstat (limited to 'source4/client')
-rw-r--r--source4/client/smbmount.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c
index 907405535e..36271c9a2e 100644
--- a/source4/client/smbmount.c
+++ b/source4/client/smbmount.c
@@ -409,7 +409,7 @@ static void send_fs_socket(struct loadparm_context *lp_ctx,
DEBUG(2,("mount.smbfs[%d]: got signal, getting new socket\n", sys_getpid()));
c = do_connection(the_service,
lp_unicode(lp_ctx),
- lp_cli_maxprotocol(global_loadparm));
+ lp_cli_maxprotocol(lp_ctx));
}
}
@@ -422,7 +422,7 @@ static void send_fs_socket(struct loadparm_context *lp_ctx,
/**
* Mount a smbfs
**/
-static void init_mount(void)
+static void init_mount(struct loadparm_context *lp_ctx)
{
char mount_point[MAXPATHLEN+1];
pstring tmp;
@@ -437,7 +437,7 @@ static void init_mount(void)
}
- c = do_connection(service, lp_unicode(global_loadparm), lp_cli_maxprotocol(global_loadparm));
+ c = do_connection(service, lp_unicode(lp_ctx), lp_cli_maxprotocol(lp_ctx));
if (!c) {
fprintf(stderr,"SMB connection failed\n");
exit(1);
@@ -530,7 +530,7 @@ static void init_mount(void)
for any reason, we will have to unmount the mount point. There
is no exit from the next call...
*/
- send_fs_socket(global_loadparm, service, mount_point, c);
+ send_fs_socket(lp_ctx, service, mount_point, c);
}
@@ -923,6 +923,6 @@ static void parse_mount_smb(int argc, char **argv)
}
strupper(my_netbios_name);
- init_mount();
+ init_mount(global_loadparm);
return 0;
}