X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5126ed1ef05aa7130c333ee74d7d00dbcb9a29db..da3478b2a7b0a15f9815dbc3463b98e7249422cc:/clientserver.c diff --git a/clientserver.c b/clientserver.c index a8104839..c690dba2 100644 --- a/clientserver.c +++ b/clientserver.c @@ -198,7 +198,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, if (protocol_version < 23) { if (protocol_version == 22 || !am_sender) - io_start_multiplex_in(f_in); + io_start_multiplex_in(); } return 0; @@ -450,13 +450,13 @@ static int rsync_module(int f_in, int f_out, int i) if (protocol_version < 23 && (protocol_version == 22 || am_sender)) - io_start_multiplex_out(f_out); + io_start_multiplex_out(); else if (!ret) { /* We have to get I/O multiplexing started so that we can * get the error back to the client. This means getting * the protocol setup finished first in later versions. */ setup_protocol(f_out, f_in); - io_start_multiplex_out(f_out); + io_start_multiplex_out(); } if (!ret) { @@ -497,6 +497,8 @@ int start_daemon(int f_in, int f_out) char *motd; int i = -1; + io_set_sock_fds(f_in, f_out); + if (!lp_load(config_file, 0)) exit_cleanup(RERR_SYNTAX);