X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/90d151f423b5c5f3c5a73b95e4fe85626fb653cf..87a57a3072c0fe742b154bd62869cc08c65625bb:/compat.c

diff --git a/compat.c b/compat.c
index f30a9f55..be0bf473 100644
--- a/compat.c
+++ b/compat.c
@@ -28,13 +28,15 @@
 int remote_protocol = 0;
 
 extern int verbose;
-extern int itemize_changes;
 extern int am_server;
 extern int am_sender;
+extern int inplace;
 extern int fuzzy_basis;
 extern int read_batch;
 extern int checksum_seed;
+extern int basis_dir_cnt;
 extern int protocol_version;
+extern char *dest_option;
 
 void setup_protocol(int f_out,int f_in)
 {
@@ -78,13 +80,24 @@ void setup_protocol(int f_out,int f_in)
 
 	if (fuzzy_basis && protocol_version < 29) {
 		rprintf(FERROR,
-			"--fuzzy requres protocol 29 or higher (negotiated %d).\n",
+			"--fuzzy requires protocol 29 or higher (negotiated %d).\n",
 			protocol_version);
 		exit_cleanup(RERR_PROTOCOL);
 	}
 
-	if (itemize_changes && protocol_version < 29)
-		itemize_changes = 0;
+	if (basis_dir_cnt && inplace && protocol_version < 29) {
+		rprintf(FERROR,
+			"%s with --inplace requires protocol 29 or higher (negotiated %d).\n",
+			dest_option, protocol_version);
+		exit_cleanup(RERR_PROTOCOL);
+	}
+
+	if (basis_dir_cnt > 1 && protocol_version < 29) {
+		rprintf(FERROR,
+			"Multiple %s options requires protocol 29 or higher (negotiated %d).\n",
+			dest_option, protocol_version);
+		exit_cleanup(RERR_PROTOCOL);
+	}
 
 	if (am_server) {
 		if (!checksum_seed)