summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-09-02 12:02:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:30 -0500
commitb990e9a97b02cec9f012bacc6bb266a0403f6792 (patch)
treea870364fe39df6a89e022fc5bdbcad549b9bb66a /source4
parentc6dd8f9c9a919c52fe6583277bbe07f2c6c72dc7 (diff)
downloadsamba-b990e9a97b02cec9f012bacc6bb266a0403f6792.tar.gz
samba-b990e9a97b02cec9f012bacc6bb266a0403f6792.tar.bz2
samba-b990e9a97b02cec9f012bacc6bb266a0403f6792.zip
r2184: use the smb.conf socket options for client code too
(This used to be commit 7256945b526a1ee68d18eb579e592f7389740c22)
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/raw/clisocket.c1
-rw-r--r--source4/librpc/rpc/dcerpc_tcp.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index 1004db4040..9aea8624d0 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -79,6 +79,7 @@ BOOL smbcli_sock_connect(struct smbcli_socket *sock, struct in_addr *ip, int por
}
set_blocking(sock->fd, False);
+ set_socket_options(sock->fd, lp_socket_options());
return True;
}
diff --git a/source4/librpc/rpc/dcerpc_tcp.c b/source4/librpc/rpc/dcerpc_tcp.c
index 35928cc1c4..896675a7f8 100644
--- a/source4/librpc/rpc/dcerpc_tcp.c
+++ b/source4/librpc/rpc/dcerpc_tcp.c
@@ -298,6 +298,8 @@ NTSTATUS dcerpc_pipe_open_tcp(struct dcerpc_pipe **p,
return NT_STATUS_PORT_CONNECTION_REFUSED;
}
+ set_socket_options(fd, lp_socket_options());
+
set_blocking(fd, False);
if (!(*p = dcerpc_pipe_init())) {