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

diff --git a/compat.c b/compat.c
index 66438c4f..38618d51 100644
--- a/compat.c
+++ b/compat.c
@@ -31,6 +31,7 @@ extern int am_sender;
 extern int local_server;
 extern int inplace;
 extern int recurse;
+extern int allow_inc_recurse;
 extern int fuzzy_basis;
 extern int read_batch;
 extern int max_delete;
@@ -42,6 +43,7 @@ extern int protocol_version;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int preserve_acls;
+extern int preserve_xattrs;
 extern int preserve_hard_links;
 extern int need_messages_from_generator;
 extern int delete_mode, delete_before, delete_during, delete_after;
@@ -64,6 +66,8 @@ void setup_protocol(int f_out,int f_in)
 		preserve_gid = ++file_extra_cnt;
 	if (preserve_acls && !am_sender)
 		preserve_acls = ++file_extra_cnt;
+	if (preserve_xattrs)
+		preserve_xattrs = ++file_extra_cnt;
 
 	if (remote_protocol == 0) {
 		if (!read_batch)
@@ -111,13 +115,20 @@ void setup_protocol(int f_out,int f_in)
 			    protocol_version);
 			exit_cleanup(RERR_PROTOCOL);
 		}
-		if (preserve_acls) {
+		if (preserve_acls && !local_server) {
 			rprintf(FERROR,
 			    "--acls requires protocol 30 or higher"
 			    " (negotiated %d).\n",
 			    protocol_version);
 			exit_cleanup(RERR_PROTOCOL);
 		}
+		if (preserve_xattrs && !local_server) {
+			rprintf(FERROR,
+			    "--xattrs requires protocol 30 or higher"
+			    " (negotiated %d).\n",
+			    protocol_version);
+			exit_cleanup(RERR_PROTOCOL);
+		}
 	}
 
 	if (delete_mode && !(delete_before+delete_during+delete_after)) {
@@ -160,8 +171,9 @@ void setup_protocol(int f_out,int f_in)
 			exit_cleanup(RERR_PROTOCOL);
 		}
 	} else if (protocol_version >= 30) {
-		if (recurse && !preserve_hard_links && !delete_before
-		 && !delete_after && !delay_updates && !prune_empty_dirs)
+		if (recurse && allow_inc_recurse && !preserve_hard_links
+		 && !delete_before && !delete_after && !delay_updates
+		 && !prune_empty_dirs)
 			inc_recurse = 1;
 		need_messages_from_generator = 1;
 	}