move the read only daemon test to after the protocol setup

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 8c55807..df847ff 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -101,8 +101,10 @@ 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))
-               io_start_multiplex_in(fd);
+       if (remote_version < 23) {
+               if (remote_version == 22 || (remote_version > 17 && !am_sender))
+                       io_start_multiplex_in(fd);
+       }
 
        return client_run(fd, fd, -1, argc, argv);
 }
@@ -163,9 +165,6 @@ static int rsync_module(int fd, int i)
 
        module_id = i;
 
-       if (lp_read_only(i))
-               read_only = 1;
-
        am_root = (getuid() == 0);
 
        if (am_root) {
@@ -316,15 +315,9 @@ static int rsync_module(int fd, int i)
        argp = argv + optind;
        optind = 0;
 
-       if (remote_version >= 22 || (remote_version > 17 && am_sender))
-               io_start_multiplex_out(fd);
-
-       if (read_only) {
-               extern int am_sender;
-               if (!am_sender) {
-                       rprintf(FERROR,"ERROR: module is read only\n");
-                       return -1;
-               }
+       if (remote_version < 23) {
+               if (remote_version == 22 || (remote_version > 17 && am_sender))
+                       io_start_multiplex_out(fd);
        }
 
        if (!ret) {
@@ -448,7 +441,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 +456,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);