Implemented a "!" modifier for filter rules that lets a rule trigger

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index 57563b0..7e4cf92 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -37,13 +37,9 @@ extern int protocol_version;
 void setup_protocol(int f_out,int f_in)
 {
        if (remote_protocol == 0) {
-               if (am_server) {
-                       remote_protocol = read_int(f_in);
+               if (!read_batch)
                        write_int(f_out, protocol_version);
-               } else {
-                       write_int(f_out, protocol_version);
-                       remote_protocol = read_int(f_in);
-               }
+               remote_protocol = read_int(f_in);
                if (protocol_version > remote_protocol)
                        protocol_version = remote_protocol;
        }
@@ -59,7 +55,7 @@ void setup_protocol(int f_out,int f_in)
        }
        if (remote_protocol < MIN_PROTOCOL_VERSION
         || remote_protocol > MAX_PROTOCOL_VERSION) {
-               rprintf(FERROR,"protocol version mismatch - is your shell clean?\n");
+               rprintf(FERROR,"protocol version mismatch -- is your shell clean?\n");
                rprintf(FERROR,"(see the rsync man page for an explanation)\n");
                exit_cleanup(RERR_PROTOCOL);
        }