patch from Alberto Accomazzi <aaccomazzi@cfa.harvard.edu> to add

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index f53c433..af72f8b 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -44,10 +44,8 @@ void setup_protocol(int f_out,int f_in)
                if (am_server) {
                        remote_version = read_int(f_in);
                        write_int(f_out,PROTOCOL_VERSION);
-                       write_flush(f_out);
                } else {
                        write_int(f_out,PROTOCOL_VERSION);
-                       write_flush(f_out);
                        remote_version = read_int(f_in);
                }
        }
@@ -55,7 +53,8 @@ void setup_protocol(int f_out,int f_in)
        if (remote_version < MIN_PROTOCOL_VERSION ||
            remote_version > MAX_PROTOCOL_VERSION) {
                rprintf(FERROR,"protocol version mismatch - is your shell clean?\n");
-               exit_cleanup(1);
+               rprintf(FERROR,"(see the rsync man page for an explanation)\n");
+               exit_cleanup(RERR_PROTOCOL);
        }       
        
        if (verbose > 2)