X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/439a198d02b33c473671acda35e98a1ba6a3ad8d..ac98cd98e361d7703a9e8411aa7102613a6fb025:/clientserver.c diff --git a/clientserver.c b/clientserver.c index b631ef2c..4c8057ee 100644 --- a/clientserver.c +++ b/clientserver.c @@ -42,9 +42,9 @@ extern int filesfrom_fd; extern int remote_protocol; extern int protocol_version; extern int io_timeout; -extern int orig_umask; extern int no_detach; extern int default_af_hint; +extern mode_t orig_umask; extern char *bind_address; extern char *sockopts; extern char *config_file; @@ -733,8 +733,6 @@ int start_daemon(int f_in, int f_out) char *host = client_name(f_in); int i; - rprintf(FLOG, "connect from %s (%s)\n", host, addr); - io_set_sock_fds(f_in, f_out); if (!lp_load(config_file, 0)) @@ -742,6 +740,8 @@ int start_daemon(int f_in, int f_out) log_init(); + rprintf(FLOG, "connect from %s (%s)\n", host, addr); + if (!am_server) { set_socket_options(f_in, "SO_KEEPALIVE"); if (sockopts)