X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c12895089cfc31fd372a0fcf0da6ffb6222fa73b..16edf86595a5a990a942fa045dfb523dae1fe6cb:/compat.c

diff --git a/compat.c b/compat.c
index ed1f2a20..3f4bd45c 100644
--- a/compat.c
+++ b/compat.c
@@ -28,8 +28,10 @@ int inc_recurse = 0;
 extern int verbose;
 extern int am_server;
 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;
@@ -40,6 +42,8 @@ extern int prune_empty_dirs;
 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;
@@ -60,6 +64,10 @@ 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 (preserve_xattrs)
+		preserve_xattrs = ++file_extra_cnt;
 
 	if (remote_protocol == 0) {
 		if (!read_batch)
@@ -107,6 +115,20 @@ 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 (preserve_xattrs) {
+			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)) {
@@ -149,23 +171,14 @@ 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;
 	}
 
-	if (make_backups && !backup_dir && delete_mode && !delete_excluded
-	 && !am_server) {
-		char *rule;
-		if (asprintf(&rule, "P%s *%s",
-			    !am_sender || protocol_version >= 30 ? "p" : "",
-			    backup_suffix) < 0)
-			out_of_memory("setup_protocol");
-		parse_rule(&filter_list, rule, 0, 0);
-		free(rule);
-	}
-	if (partial_dir && *partial_dir != '/' && !am_server) {
+	if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
 		int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY;
 		if (!am_sender || protocol_version >= 30)
 			flags |= MATCHFLG_PERISHABLE;