summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-30 01:29:53 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-30 01:29:53 +0200
commitc8a19f0b8373bec27f4d3638bb731963896f3ff5 (patch)
tree468bb95a6325a34fe0d7fc4129c3c506f4c72146 /source4/libcli
parent21df9532f54ad15c308630672f3b8a6dc4ce6294 (diff)
downloadsamba-c8a19f0b8373bec27f4d3638bb731963896f3ff5.tar.gz
samba-c8a19f0b8373bec27f4d3638bb731963896f3ff5.tar.bz2
samba-c8a19f0b8373bec27f4d3638bb731963896f3ff5.zip
Pass options struct into session initialization functions rather than
using global_loadparm.
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/cliconnect.c6
-rw-r--r--source4/libcli/raw/clisession.c7
-rw-r--r--source4/libcli/smb_composite/connect.c5
3 files changed, 12 insertions, 6 deletions
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index c20a7fd935..6fb9f130a9 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -73,8 +73,12 @@ NTSTATUS smbcli_session_setup(struct smbcli_state *cli,
{
struct smb_composite_sesssetup setup;
NTSTATUS status;
+ struct smbcli_session_options options;
- cli->session = smbcli_session_init(cli->transport, cli, true);
+ lp_smbcli_session_options(global_loadparm, &options);
+
+ cli->session = smbcli_session_init(cli->transport, cli, true,
+ options);
if (!cli->session) return NT_STATUS_UNSUCCESSFUL;
setup.in.sesskey = cli->transport->negotiate.sesskey;
diff --git a/source4/libcli/raw/clisession.c b/source4/libcli/raw/clisession.c
index ad4ca7b471..38d8f700f2 100644
--- a/source4/libcli/raw/clisession.c
+++ b/source4/libcli/raw/clisession.c
@@ -35,7 +35,8 @@
Initialize the session context
****************************************************************************/
struct smbcli_session *smbcli_session_init(struct smbcli_transport *transport,
- TALLOC_CTX *parent_ctx, bool primary)
+ TALLOC_CTX *parent_ctx, bool primary,
+ struct smbcli_session_options options)
{
struct smbcli_session *session;
uint16_t flags2;
@@ -53,9 +54,7 @@ struct smbcli_session *smbcli_session_init(struct smbcli_transport *transport,
}
session->pid = (uint16_t)getpid();
session->vuid = UID_FIELD_INVALID;
- session->options.lanman_auth = lp_client_lanman_auth(global_loadparm);
- session->options.ntlmv2_auth = lp_client_ntlmv2_auth(global_loadparm);
- session->options.plaintext_auth = lp_client_plaintext_auth(global_loadparm);
+ session->options = options;
capabilities = transport->negotiate.capabilities;
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index e56339f96b..5f651f4865 100644
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -229,12 +229,15 @@ static NTSTATUS connect_negprot(struct composite_context *c,
{
struct connect_state *state = talloc_get_type(c->private_data, struct connect_state);
NTSTATUS status;
+ struct smbcli_session_options options;
+
+ lp_smbcli_session_options(global_loadparm, &options);
status = smb_raw_negotiate_recv(state->req);
NT_STATUS_NOT_OK_RETURN(status);
/* next step is a session setup */
- state->session = smbcli_session_init(state->transport, state, true);
+ state->session = smbcli_session_init(state->transport, state, true, options);
NT_STATUS_HAVE_NO_MEMORY(state->session);
/* setup for a tconx (or at least have the structure ready to