summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-25 12:51:55 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-25 12:51:55 +0100
commit3101cb888d5cbad785050b8491b138d683d444fb (patch)
tree4afb829887f209cbf4564918c1a223fcb42dcb93 /source4/libcli
parent4590432d6290fd1c21a27ec5e6643d455e4fec69 (diff)
downloadsamba-3101cb888d5cbad785050b8491b138d683d444fb.tar.gz
samba-3101cb888d5cbad785050b8491b138d683d444fb.tar.bz2
samba-3101cb888d5cbad785050b8491b138d683d444fb.zip
Remove uses of global_loadparm.
(This used to be commit a16c9a2129ce92e7e1a613b2badd168e42ead436)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/raw/clisocket.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index 8fcb8bb48c..eaa02e1047 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -33,6 +33,7 @@ struct sock_connect_state {
const char *host_name;
int num_ports;
uint16_t *ports;
+ const char *socket_options;
struct smbcli_socket *result;
};
@@ -80,6 +81,7 @@ struct composite_context *smbcli_sock_connect_send(TALLOC_CTX *mem_ctx,
for (i=0;ports[i];i++) {
state->ports[i] = atoi(ports[i]);
}
+ state->socket_options = lp_socket_options(global_loadparm);
ctx = socket_connect_multi_send(state, host_addr,
state->num_ports, state->ports,
@@ -108,7 +110,7 @@ static void smbcli_sock_connect_recv_conn(struct composite_context *ctx)
if (!composite_is_ok(state->ctx)) return;
state->ctx->status =
- socket_set_option(sock, lp_socket_options(global_loadparm), NULL);
+ socket_set_option(sock, state->socket_options, NULL);
if (!composite_is_ok(state->ctx)) return;