damn.

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 2a5597e..ac5c1d2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -283,6 +283,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
        extern int delete_after;
        extern int recurse;
        extern int delete_mode;
+       extern int remote_version;
 
        if (preserve_hard_links)
                init_hard_links(flist);
@@ -320,6 +321,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
                recv_files(f_in,flist,local_name,recv_pipe[1]);
                report(f_in);
 
+               write_int(recv_pipe[1],-1);
                io_flush();
                _exit(0);
        }
@@ -335,7 +337,13 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
        generate_files(f_out,flist,local_name,recv_pipe[0]);
 
+       read_int(recv_pipe[1]);
+       if (remote_version >= 24) {
+               /* send a final goodbye message */
+               write_int(f_out, -1);
+       }
        io_flush();
+
        wait_process(pid, &status);
        return status;
 }
@@ -350,9 +358,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];
@@ -393,11 +410,11 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
        extern int am_sender;
        extern int remote_version;
 
+       setup_protocol(f_out, f_in);
+
        if (remote_version >= 23)
                io_start_multiplex_out(f_out);
 
-       setup_protocol(f_out, f_in);
-
        if (am_sender) {
                recv_exclude_list(f_in);
                if (cvs_exclude)
@@ -418,10 +435,10 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
        extern int list_only;
        extern int remote_version;
 
+       setup_protocol(f_out,f_in);
+
        if (remote_version >= 23)
                io_start_multiplex_in(f_in);
-
-       setup_protocol(f_out,f_in);
        
        if (am_sender) {
                extern int cvs_exclude;
@@ -443,6 +460,10 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
                        wait_process(pid, &status);
                }
                report(-1);
+               if (remote_version >= 24) {
+                       /* final goodbye message */             
+                       read_int(f_in);
+               }
                exit_cleanup(status);
        }