summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-05 19:33:11 -0600
committerStefan Metzmacher <metze@samba.org>2008-01-05 13:36:02 -0600
commitb7e34eb62580565d1526f793b5df8b26cdd65aa4 (patch)
tree93785b275b3f9830429bee0c819cabc1849d8fc2
parent58788694cd86bbd0e16d63336880c54c0ef2e88d (diff)
downloadsamba-b7e34eb62580565d1526f793b5df8b26cdd65aa4.tar.gz
samba-b7e34eb62580565d1526f793b5df8b26cdd65aa4.tar.bz2
samba-b7e34eb62580565d1526f793b5df8b26cdd65aa4.zip
r26674: smb_composite: Avoid use of global_loadparm.
Hopefully this fixes OpenChange's mapiadmin. (This used to be commit 2df0f7016e27705c3799b2f6bb20fcc17b103c36)
-rw-r--r--source4/libcli/smb_composite/connect.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index a44765e980..22573442a2 100644
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -172,8 +172,9 @@ static NTSTATUS connect_session_setup(struct composite_context *c,
state->io_setup->in.credentials = cli_credentials_init(state);
NT_STATUS_HAVE_NO_MEMORY(state->io_setup->in.credentials);
- cli_credentials_set_conf(state->io_setup->in.credentials,
- global_loadparm);
+ cli_credentials_set_workstation(state->io_setup->in.credentials,
+ cli_credentials_get_workstation(state->io->in.credentials),
+ CRED_SPECIFIED);
cli_credentials_set_anonymous(state->io_setup->in.credentials);
/* If the preceding attempt was with extended security, we