X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/085e2fd588d27cedc37edaee0575cfea7bb2f2d8..1c3344a105f656a45f6b46e1710c3fc4ab862a9a:/compat.c

diff --git a/compat.c b/compat.c
index 62b2ba02..66438c4f 100644
--- a/compat.c
+++ b/compat.c
@@ -41,6 +41,7 @@ extern int prune_empty_dirs;
 extern int protocol_version;
 extern int preserve_uid;
 extern int preserve_gid;
+extern int preserve_acls;
 extern int preserve_hard_links;
 extern int need_messages_from_generator;
 extern int delete_mode, delete_before, delete_during, delete_after;
@@ -61,6 +62,8 @@ void setup_protocol(int f_out,int f_in)
 		preserve_uid = ++file_extra_cnt;
 	if (preserve_gid)
 		preserve_gid = ++file_extra_cnt;
+	if (preserve_acls && !am_sender)
+		preserve_acls = ++file_extra_cnt;
 
 	if (remote_protocol == 0) {
 		if (!read_batch)
@@ -108,6 +111,13 @@ void setup_protocol(int f_out,int f_in)
 			    protocol_version);
 			exit_cleanup(RERR_PROTOCOL);
 		}
+		if (preserve_acls) {
+			rprintf(FERROR,
+			    "--acls requires protocol 30 or higher"
+			    " (negotiated %d).\n",
+			    protocol_version);
+			exit_cleanup(RERR_PROTOCOL);
+		}
 	}
 
 	if (delete_mode && !(delete_before+delete_during+delete_after)) {