- switched on multiplexing for all connections, not just daemon

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 8c55807..2cd2c40 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -101,7 +101,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        }
        io_printf(fd,"\n");
 
-       if (remote_version >= 22 || (remote_version > 17 && !am_sender))
+       if (remote_version == 22 || (remote_version > 17 && !am_sender))
                io_start_multiplex_in(fd);
 
        return client_run(fd, fd, -1, argc, argv);
@@ -316,7 +316,7 @@ static int rsync_module(int fd, int i)
        argp = argv + optind;
        optind = 0;
 
-       if (remote_version >= 22 || (remote_version > 17 && am_sender))
+       if (remote_version == 22 || (remote_version > 17 && am_sender))
                io_start_multiplex_out(fd);
 
        if (read_only) {
@@ -448,7 +448,6 @@ int daemon_main(void)
        become_daemon();
 
        if (!lp_load(config_file, 1)) {
-               fprintf(stderr,"failed to load config file %s\n", config_file);
                exit_cleanup(RERR_SYNTAX);
        }
 
@@ -464,7 +463,7 @@ int daemon_main(void)
                if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
                                        0666 & ~orig_umask)) == -1) {
                    cleanup_set_pid(0);
-                   fprintf(stderr,"failed to create pid file %s\n", pid_file);
+                   rprintf(FLOG,"failed to create pid file %s\n", pid_file);
                    exit_cleanup(RERR_FILEIO);
                }
                slprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);