summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-10 18:42:04 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:49:18 +0100
commit3971827b6ee7c84beaf4449e3c12dfe9f2d62c77 (patch)
treed97187552705dc3dc8f506f5aaa6b15aa6271970 /source4
parent43d18b91b4e8ec417a6010ab22c1ba4edb1631c3 (diff)
downloadsamba-3971827b6ee7c84beaf4449e3c12dfe9f2d62c77.tar.gz
samba-3971827b6ee7c84beaf4449e3c12dfe9f2d62c77.tar.bz2
samba-3971827b6ee7c84beaf4449e3c12dfe9f2d62c77.zip
r26384: Fix another global_loadparm instance.
(This used to be commit 881ec40d7a4c97863abee5740187e9aa0a1801bb)
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/cliconnect.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index d70f592d9d..a170024def 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -66,7 +66,8 @@ NTSTATUS smbcli_negprot(struct smbcli_state *cli, bool unicode, int maxprotocol)
/* wrapper around smb_raw_sesssetup() */
NTSTATUS smbcli_session_setup(struct smbcli_state *cli,
- struct cli_credentials *credentials)
+ struct cli_credentials *credentials,
+ const char *workgroup)
{
struct smb_composite_sesssetup setup;
NTSTATUS status;
@@ -77,7 +78,7 @@ NTSTATUS smbcli_session_setup(struct smbcli_state *cli,
setup.in.sesskey = cli->transport->negotiate.sesskey;
setup.in.capabilities = cli->transport->negotiate.capabilities;
setup.in.credentials = credentials;
- setup.in.workgroup = lp_workgroup(global_loadparm);
+ setup.in.workgroup = workgroup;
status = smb_composite_sesssetup(cli->session, &setup);