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 6ea9321..11344eb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -280,16 +280,26 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
        int recv_pipe[2];
        int error_pipe[2];
        extern int preserve_hard_links;
+       extern int delete_after;
+       extern int recurse;
+       extern int delete_mode;
 
        if (preserve_hard_links)
                init_hard_links(flist);
 
-       if (pipe(recv_pipe) < 0) {
+       if (!delete_after) {
+               /* I moved this here from recv_files() to prevent a race condition */
+               if (recurse && delete_mode && !local_name && flist->count>0) {
+                       delete_files(flist);
+               }
+       }
+
+       if (fd_pair(recv_pipe) < 0) {
                rprintf(FERROR,"pipe failed in do_recv\n");
                exit_cleanup(RERR_SOCKETIO);
        }
 
-       if (pipe(error_pipe) < 0) {
+       if (fd_pair(error_pipe) < 0) {
                rprintf(FERROR,"error pipe failed in do_recv\n");
                exit_cleanup(RERR_SOCKETIO);
        }
@@ -340,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];
@@ -381,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)
@@ -402,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;