summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-11-01 23:26:36 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-11-01 23:26:36 +0100
commitd9cbf2b0d9fdd1373ea0a0d021df3230637e21ac (patch)
tree0e8efd7342b31ce79d7ea0fb0eb5681907a13fe2 /source4/libcli
parent79423337125978f5b5eef341283ff2a9c891fc5c (diff)
downloadsamba-d9cbf2b0d9fdd1373ea0a0d021df3230637e21ac.tar.gz
samba-d9cbf2b0d9fdd1373ea0a0d021df3230637e21ac.tar.bz2
samba-d9cbf2b0d9fdd1373ea0a0d021df3230637e21ac.zip
Remove another use of global_loadparm.
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/smb2/connect.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index d5fff4a305..61ee994484 100644
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -235,7 +235,8 @@ struct composite_context *smb2_connect_send(TALLOC_CTX *mem_ctx,
struct resolve_context *resolve_ctx,
struct cli_credentials *credentials,
struct event_context *ev,
- struct smbcli_options *options)
+ struct smbcli_options *options,
+ const char *socket_options)
{
struct composite_context *c;
struct smb2_connect_state *state;
@@ -258,7 +259,7 @@ struct composite_context *smb2_connect_send(TALLOC_CTX *mem_ctx,
state->share = talloc_strdup(c, share);
if (composite_nomem(state->share, c)) return c;
state->resolve_ctx = talloc_reference(state, resolve_ctx);
- state->socket_options = lp_socket_options(global_loadparm);
+ state->socket_options = talloc_reference(state, socket_options);
if (composite_nomem(state->socket_options, c)) return c;
ZERO_STRUCT(name);
@@ -296,10 +297,12 @@ NTSTATUS smb2_connect(TALLOC_CTX *mem_ctx,
struct cli_credentials *credentials,
struct smb2_tree **tree,
struct event_context *ev,
- struct smbcli_options *options)
+ struct smbcli_options *options,
+ const char *socket_options)
{
struct composite_context *c = smb2_connect_send(mem_ctx, host, ports,
share, resolve_ctx,
- credentials, ev, options);
+ credentials, ev, options,
+ socket_options);
return smb2_connect_recv(c, mem_ctx, tree);
}