summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-11-09 15:09:16 -0800
committerJeremy Allison <jra@samba.org>2007-11-09 15:09:16 -0800
commit6c25260ec12552653eabed25451866e370108c37 (patch)
tree28dd27dac5e765c489057976c56c2f5a9b3ff459 /source3/smbd
parentf9578af966c1c1b5b5df4acac9977472d2896bea (diff)
downloadsamba-6c25260ec12552653eabed25451866e370108c37.tar.gz
samba-6c25260ec12552653eabed25451866e370108c37.tar.bz2
samba-6c25260ec12552653eabed25451866e370108c37.zip
Remove more static fstring/pstrings. Fix socket option
set on wrong fd (-1). Jeremy. (This used to be commit 52fe04df8e8c08126afe61d509fc1d3cb676e327)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/server.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 547e9c6e81..e89a94599e 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -379,8 +379,7 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
/* ready to listen */
set_socket_options(s,"SO_KEEPALIVE");
- set_socket_options(smbd_server_fd(),
- lp_socket_options());
+ set_socket_options(s,lp_socket_options());
/* Set server socket to
* non-blocking for the accept. */
@@ -446,8 +445,7 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
/* ready to listen */
set_socket_options(s,"SO_KEEPALIVE");
- set_socket_options(smbd_server_fd(),
- lp_socket_options());
+ set_socket_options(s,lp_socket_options());
/* Set server socket to non-blocking
* for the accept. */