diff options
| author | Wayne Davison <wayned@samba.org> | 2006-01-26 12:31:47 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2006-01-26 12:31:47 +0000 |
| commit | 34937987a6ec0ab6d0585c650c2d7114f8929b4b (patch) | |
| tree | 690fce4c5165ac1f581781d9d6aed54889ab4c50 /clientserver.c | |
| parent | 831f06a5a577d6575bd3560ebe36c5939c917037 (diff) | |
| download | android_external_rsync-34937987a6ec0ab6d0585c650c2d7114f8929b4b.tar.gz android_external_rsync-34937987a6ec0ab6d0585c650c2d7114f8929b4b.tar.bz2 android_external_rsync-34937987a6ec0ab6d0585c650c2d7114f8929b4b.zip | |
Make use of the new sockopts variable.
Diffstat (limited to 'clientserver.c')
| -rw-r--r-- | clientserver.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/clientserver.c b/clientserver.c index 978135d1..4b4a08f9 100644 --- a/clientserver.c +++ b/clientserver.c @@ -45,6 +45,7 @@ extern int orig_umask; extern int no_detach; extern int default_af_hint; extern char *bind_address; +extern char *sockopts; extern struct filter_list_struct server_filter_list; extern char *config_file; extern char *files_from; @@ -98,6 +99,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) if (fd == -1) exit_cleanup(RERR_SOCKETIO); + set_socket_options(fd, sockopts); + ret = start_inband_exchange(user, path, fd, fd, argc); return ret ? ret : client_run(fd, fd, -1, argc, argv); @@ -718,7 +721,10 @@ int start_daemon(int f_in, int f_out) if (!am_server) { set_socket_options(f_in, "SO_KEEPALIVE"); - set_socket_options(f_in, lp_socket_options()); + if (sockopts) + set_socket_options(f_in, sockopts); + else + set_socket_options(f_in, lp_socket_options()); set_nonblocking(f_in); } |