move the read only daemon test to after the protocol setup

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 80839de..11344eb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -350,9 +350,18 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
        extern int delete_mode;
        extern int delete_excluded;
        extern int am_daemon;
+       extern int module_id;
+       extern int am_sender;
 
        if (verbose > 2)
                rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
+
+       if (am_daemon && lp_read_only(module_id) && !am_sender) {
+               rprintf(FERROR,"ERROR: module is read only\n");
+               exit_cleanup(RERR_SYNTAX);
+               return;
+       }
+
        
        if (argc > 0) {
                dir = argv[0];
@@ -391,9 +400,13 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
 {
        extern int cvs_exclude;
        extern int am_sender;
+       extern int remote_version;
 
        setup_protocol(f_out, f_in);
 
+       if (remote_version >= 23)
+               io_start_multiplex_out(f_out);
+
        if (am_sender) {
                recv_exclude_list(f_in);
                if (cvs_exclude)
@@ -412,8 +425,12 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
        char *local_name = NULL;
        extern int am_sender;
        extern int list_only;
+       extern int remote_version;
 
        setup_protocol(f_out,f_in);
+
+       if (remote_version >= 23)
+               io_start_multiplex_in(f_in);
        
        if (am_sender) {
                extern int cvs_exclude;