X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4ea812445d5f42d44a16a4d04eae8f48127ec66f..37802f40dcbe8956ba8ee3bfbddf10c60f94c209:/compat.c

diff --git a/compat.c b/compat.c
index c2a11038..7e4cf925 100644
--- a/compat.c
+++ b/compat.c
@@ -27,37 +27,27 @@
 
 int remote_protocol = 0;
 
+extern int verbose;
 extern int am_server;
-
-extern int preserve_links;
-extern int preserve_perms;
-extern int preserve_devices;
-extern int preserve_uid;
-extern int preserve_gid;
-extern int preserve_times;
-extern int always_checksum;
+extern int am_sender;
+extern int read_batch;
 extern int checksum_seed;
-
-
 extern int protocol_version;
-extern int verbose;
-
-extern int read_batch;
-extern int write_batch;
 
 void setup_protocol(int f_out,int f_in)
 {
 	if (remote_protocol == 0) {
-		if (am_server) {
-			remote_protocol = read_int(f_in);
-			write_int(f_out, protocol_version);
-		} else {
+		if (!read_batch)
 			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;
 	}
+	if (read_batch && remote_protocol > protocol_version) {
+	        rprintf(FERROR, "The protocol version in the batch file is too new (%d > %d).\n",
+			remote_protocol, protocol_version);
+		exit_cleanup(RERR_PROTOCOL);
+	}
 
 	if (verbose > 3) {
 		rprintf(FINFO, "(%s) Protocol versions: remote=%d, negotiated=%d\n",
@@ -65,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);
 	}
@@ -85,11 +75,9 @@ void setup_protocol(int f_out,int f_in)
 	}
 
 	if (am_server) {
-		if (read_batch || write_batch)
-			checksum_seed = 32761;
-		else
+		if (!checksum_seed)
 			checksum_seed = time(NULL);
-		write_int(f_out,checksum_seed);
+		write_int(f_out, checksum_seed);
 	} else {
 		checksum_seed = read_int(f_in);
 	}