aboutsummaryrefslogtreecommitdiffstats
path: root/clientserver.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2008-04-15 08:34:17 -0700
committerWayne Davison <wayned@samba.org>2008-04-15 08:34:17 -0700
commit1c3e6e8b2611f85cdf3ada054ef2c419ecaf399c (patch)
tree84ee2cdda5b84046e3fb853cdc44e984e4a0346f /clientserver.c
parentf2681d42ff564ec2d000383ee5c5f43cc3f283d8 (diff)
downloadandroid_external_rsync-1c3e6e8b2611f85cdf3ada054ef2c419ecaf399c.tar.gz
android_external_rsync-1c3e6e8b2611f85cdf3ada054ef2c419ecaf399c.tar.bz2
android_external_rsync-1c3e6e8b2611f85cdf3ada054ef2c419ecaf399c.zip
Moved the setting of the socket options before the connect().
Diffstat (limited to 'clientserver.c')
-rw-r--r--clientserver.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/clientserver.c b/clientserver.c
index 52913567..f78c61c3 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -121,8 +121,6 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[],
if (fd == -1)
exit_cleanup(RERR_SOCKETIO);
- set_socket_options(fd, sockopts);
-
#ifdef ICONV_CONST
setup_iconv();
#endif
@@ -931,10 +929,6 @@ int start_daemon(int f_in, int f_out)
if (!am_server) {
set_socket_options(f_in, "SO_KEEPALIVE");
- if (sockopts)
- set_socket_options(f_in, sockopts);
- else
- set_socket_options(f_in, lp_socket_options());
set_nonblocking(f_in);
}