X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/81ecd8e0c3d10388565256dd822578c8bd5ccabb..2dbc45e750bbab50a34f0d49925f1f624c86d6b3:/acls.diff

diff --git a/acls.diff b/acls.diff
index cdfa331..1fc6ccc 100644
--- a/acls.diff
+++ b/acls.diff
@@ -21,9 +21,9 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
  ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
  	zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
- OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
- 	main.o checksum.o match.o syscall.o log.o backup.o
- OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
+ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+ 	util.o main.o checksum.o match.o syscall.o log.o backup.o
+ OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \
 -	fileio.o batch.o clientname.o chmod.o
 +	fileio.o batch.o clientname.o chmod.o acls.o
  OBJS3=progress.o pipe.o
@@ -31,7 +31,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
 --- old/acls.c
 +++ new/acls.c
-@@ -0,0 +1,1096 @@
+@@ -0,0 +1,1094 @@
 +/*
 + * Handle passing Access Control Lists between systems.
 + *
@@ -63,9 +63,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +extern int read_only;
 +extern int list_only;
 +extern int orig_umask;
-+extern int preserve_acls;
-+extern int flist_extra_ndx;
-+extern unsigned int file_struct_len;
++extern int protocol_version;
 +
 +/* === ACL structures === */
 +
@@ -647,7 +645,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +		}
 +
 +		/* Avoid sending values that can be inferred from other data. */
-+		if (type == SMB_ACL_TYPE_ACCESS)
++		if (type == SMB_ACL_TYPE_ACCESS && protocol_version >= 30)
 +			rsync_acl_strip_perms(racl);
 +		if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) != -1) {
 +			write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'a' : 'd');
@@ -921,7 +919,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +#ifdef SMB_ACL_LOSES_SPECIAL_MODE_BITS
 +	/* Ensure that chmod() will be called to restore any lost setid bits. */
 +	if (old_mode & (S_ISUID | S_ISGID | S_ISVTX)
-+	 && (old_mode & CHMOD_BITS) == (mode & CHMOD_BITS))
++	 && BITS_EQUAL(old_mode, mode, CHMOD_BITS))
 +		old_mode &= ~(S_ISUID | S_ISGID | S_ISVTX);
 +#endif
 +
@@ -1221,9 +1219,20 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			/* If someone has hard-linked the file into the backup
  			 * dir, rename() might return success but do nothing! */
  			robust_unlink(fname); /* Just in case... */
+--- old/compat.c
++++ new/compat.c
+@@ -56,6 +56,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)
 --- old/configure.in
 +++ new/configure.in
-@@ -537,6 +537,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
+@@ -542,6 +542,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
  fi
  
@@ -1235,7 +1244,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  dnl At the moment we don't test for a broken memcmp(), because all we
  dnl need to do is test for equality, not comparison, and it seems that
  dnl every platform has a memcmp that can do at least that.
-@@ -801,6 +806,78 @@ AC_SUBST(OBJ_RESTORE)
+@@ -806,6 +811,78 @@ AC_SUBST(OBJ_RESTORE)
  AC_SUBST(CC_SHOBJ_FLAG)
  AC_SUBST(BUILD_POPT)
  
@@ -1316,7 +1325,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
 --- old/flist.c
 +++ new/flist.c
-@@ -40,6 +40,7 @@ extern int filesfrom_fd;
+@@ -42,6 +42,7 @@ extern int filesfrom_fd;
  extern int one_file_system;
  extern int copy_dirlinks;
  extern int keep_dirlinks;
@@ -1324,7 +1333,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  extern int preserve_links;
  extern int preserve_hard_links;
  extern int preserve_devices;
-@@ -144,6 +145,8 @@ static void list_file_entry(struct file_
+@@ -153,6 +154,8 @@ static void list_file_entry(struct file_
  	permstring(permbuf, f->mode);
  	len = F_LENGTH(f);
  
@@ -1333,21 +1342,21 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  #ifdef SUPPORT_LINKS
  	if (preserve_links && S_ISLNK(f->mode)) {
  		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-@@ -621,6 +624,12 @@ static struct file_struct *recv_file_ent
+@@ -715,6 +718,12 @@ static struct file_struct *recv_file_ent
  	}
  #endif
  
 +#ifdef SUPPORT_ACLS
 +	/* We need one or two index int32s when we're preserving ACLs. */
 +	if (preserve_acls)
-+		extra_len += (S_ISDIR(mode) ? 2 : 1) * sizeof (union flist_extras);
++		extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
 +#endif
 +
  	if (always_checksum && S_ISREG(mode))
  		extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
  
-@@ -733,6 +742,11 @@ static struct file_struct *recv_file_ent
- 		read_buf(f, bp, checksum_len);
+@@ -852,6 +861,11 @@ static struct file_struct *recv_file_ent
+ 			read_buf(f, bp, checksum_len);
  	}
  
 +#ifdef SUPPORT_ACLS
@@ -1355,20 +1364,20 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +		receive_acl(file, f);
 +#endif
 +
- 	return file;
- }
+ 	if (S_ISREG(mode) || S_ISLNK(mode))
+ 		stats.total_size += file_length;
  
-@@ -993,6 +1007,9 @@ static struct file_struct *send_file_nam
- 					  unsigned short flags)
+@@ -1123,6 +1137,9 @@ static struct file_struct *send_file_nam
+ 					  int flags, int filter_flags)
  {
  	struct file_struct *file;
 +#ifdef SUPPORT_ACLS
 +	statx sx;
 +#endif
  
- 	file = make_file(fname, flist, stp, flags,
- 			 f == -2 ? SERVER_FILTERS : ALL_FILTERS);
-@@ -1002,11 +1019,24 @@ static struct file_struct *send_file_nam
+ 	file = make_file(fname, flist, stp, flags, filter_flags);
+ 	if (!file)
+@@ -1131,12 +1148,26 @@ static struct file_struct *send_file_nam
  	if (chmod_modes && !S_ISLNK(file->mode))
  		file->mode = tweak_mode(file->mode, chmod_modes);
  
@@ -1385,17 +1394,20 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	flist_expand(flist);
  	flist->files[flist->count++] = file;
- 	send_file_entry(file, f);
+-	if (f >= 0)
++	if (f >= 0) {
+ 		send_file_entry(f, file, flist->count - 1);
 +#ifdef SUPPORT_ACLS
-+	if (preserve_acls && f >= 0)
-+		send_acl(&sx, f);
++		if (preserve_acls)
++			send_acl(&sx, f);
 +#endif
++	}
  	return file;
  }
  
 --- old/generator.c
 +++ new/generator.c
-@@ -35,6 +35,7 @@ extern int do_progress;
+@@ -36,6 +36,7 @@ extern int do_progress;
  extern int relative_paths;
  extern int implied_dirs;
  extern int keep_dirlinks;
@@ -1403,7 +1415,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  extern int preserve_links;
  extern int preserve_devices;
  extern int preserve_specials;
-@@ -87,6 +88,7 @@ extern int force_delete;
+@@ -90,6 +91,7 @@ extern int force_delete;
  extern int one_file_system;
  extern struct stats stats;
  extern dev_t filesystem_dev;
@@ -1411,16 +1423,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  extern char *backup_dir;
  extern char *backup_suffix;
  extern int backup_suffix_len;
-@@ -446,22 +448,27 @@ static void do_delete_pass(struct file_l
+@@ -509,22 +511,27 @@ static void do_delete_pass(struct file_l
  		rprintf(FINFO, "                    \r");
  }
  
 -int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
 +int unchanged_attrs(struct file_struct *file, statx *sxp)
  {
- 	if (preserve_perms
--	 && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
-+	 && (sxp->st.st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
+-	if (preserve_perms && !BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
++	if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
  		return 0;
  
 -	if (am_root && preserve_uid && st->st_uid != F_UID(file))
@@ -1439,12 +1450,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	return 1;
  }
  
--void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
-+void itemize(struct file_struct *file, int ndx, int statret, statx *sxp,
- 	     int32 iflags, uchar fnamecmp_type, const char *xname)
+ void itemize(struct file_struct *file, int ndx, int statret,
+-	     STRUCT_STAT *st, int32 iflags, uchar fnamecmp_type,
++	     statx *sxp, int32 iflags, uchar fnamecmp_type,
+ 	     const char *xname)
  {
  	if (statret >= 0) { /* A from-dest-dir statret can == 1! */
-@@ -469,20 +476,24 @@ void itemize(struct file_struct *file, i
+@@ -532,20 +539,24 @@ void itemize(struct file_struct *file, i
  		    : S_ISDIR(file->mode) ? !omit_dir_times
  		    : !S_ISLNK(file->mode);
  
@@ -1457,8 +1469,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -		 || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
 +		 || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
  			iflags |= ITEM_REPORT_TIME;
--		if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
-+		if ((file->mode & CHMOD_BITS) != (sxp->st.st_mode & CHMOD_BITS))
+-		if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
++		if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
  			iflags |= ITEM_REPORT_PERMS;
 -		if (preserve_uid && am_root && F_UID(file) != st->st_uid)
 +		if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
@@ -1474,16 +1486,16 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	} else
  		iflags |= ITEM_IS_NEW;
  
-@@ -736,7 +747,7 @@ void check_for_finished_hlinks(int itemi
+@@ -799,7 +810,7 @@ void check_for_finished_hlinks(int itemi
   * handling the file, -1 if no dest-linking occurred, or a non-negative
   * value if we found an alternate basis file. */
  static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 -			 char *cmpbuf, STRUCT_STAT *stp, int itemizing,
 +			 char *cmpbuf, statx *sxp, int itemizing,
- 			 int maybe_ATTRS_REPORT, enum logcode code)
+ 			 enum logcode code)
  {
  	int best_match = -1;
-@@ -745,7 +756,7 @@ static int try_dests_reg(struct file_str
+@@ -808,7 +819,7 @@ static int try_dests_reg(struct file_str
  
  	do {
  		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1492,7 +1504,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			continue;
  		switch (match_level) {
  		case 0:
-@@ -753,16 +764,20 @@ static int try_dests_reg(struct file_str
+@@ -816,16 +827,20 @@ static int try_dests_reg(struct file_str
  			match_level = 1;
  			/* FALL THROUGH */
  		case 1:
@@ -1510,13 +1522,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +#endif
 +			if (!unchanged_attrs(file, sxp))
  				continue;
- 			if (always_checksum && preserve_times
+ 			if (always_checksum > 0 && preserve_times
 -			 && cmp_time(stp->st_mtime, file->modtime))
 +			 && cmp_time(sxp->st.st_mtime, file->modtime))
  				continue;
  			best_match = j;
  			match_level = 3;
-@@ -777,7 +792,7 @@ static int try_dests_reg(struct file_str
+@@ -840,7 +855,7 @@ static int try_dests_reg(struct file_str
  	if (j != best_match) {
  		j = best_match;
  		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1525,16 +1537,22 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			return -1;
  	}
  
-@@ -785,15 +800,20 @@ static int try_dests_reg(struct file_str
- #ifdef SUPPORT_HARD_LINKS
- 		if (link_dest) {
- 			int i = itemizing && (verbose > 1 || stdout_format_has_i > 1);
--			if (hard_link_one(file, ndx, fname, 0, stp,
-+			if (hard_link_one(file, ndx, fname, 0, sxp,
- 					  cmpbuf, 1, i, code) < 0)
+@@ -850,16 +865,25 @@ static int try_dests_reg(struct file_str
+ 			if (!hard_link_one(file, fname, cmpbuf, 1))
  				goto try_a_copy;
  			if (preserve_hard_links && F_IS_HLINKED(file))
- 				hard_link_cluster(file, ndx, itemizing, code, j);
+-				finish_hard_link(file, fname, stp, itemizing, code, j);
++				finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
+ 			if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+-				itemize(file, ndx, 1, stp,
++#ifdef SUPPORT_ACLS
++				if (preserve_acls && !ACL_READY(*sxp))
++					get_acl(fname, sxp);
++#endif
++				itemize(file, ndx, 1, sxp,
+ 					ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
+ 					0, "");
+ 			}
  		} else
  #endif
 -		if (itemizing)
@@ -1546,10 +1564,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +#endif
 +			itemize(file, ndx, 0, sxp, 0, 0, NULL);
 +		}
- 		if (verbose > 1 && maybe_ATTRS_REPORT) {
+ 		if (verbose > 1 && maybe_ATTRS_REPORT)
  			rprintf(FCLIENT, "%s is uptodate\n", fname);
- 		}
-@@ -809,8 +829,13 @@ static int try_dests_reg(struct file_str
+ 		return -2;
+@@ -876,8 +900,13 @@ static int try_dests_reg(struct file_str
  			}
  			return -1;
  		}
@@ -1565,16 +1583,25 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		set_file_attrs(fname, file, NULL, 0);
  		if (maybe_ATTRS_REPORT
  		 && ((!itemizing && verbose && match_level == 2)
-@@ -833,7 +858,7 @@ static int try_dests_reg(struct file_str
+@@ -888,7 +917,7 @@ static int try_dests_reg(struct file_str
+ 		}
+ #ifdef SUPPORT_HARD_LINKS
+ 		if (preserve_hard_links && F_IS_HLINKED(file))
+-			finish_hard_link(file, fname, stp, itemizing, code, -1);
++			finish_hard_link(file, fname, &sxp->st, itemizing, code, -1);
+ #endif
+ 		return -2;
+ 	}
+@@ -900,7 +929,7 @@ static int try_dests_reg(struct file_str
   * handling the file, or -1 if no dest-linking occurred, or a non-negative
   * value if we found an alternate basis file. */
  static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 -			 char *cmpbuf, STRUCT_STAT *stp, int itemizing,
 +			 char *cmpbuf, statx *sxp, int itemizing,
- 			 int maybe_ATTRS_REPORT, enum logcode code)
+ 			 enum logcode code)
  {
  	char lnk[MAXPATHLEN];
-@@ -866,24 +891,24 @@ static int try_dests_non(struct file_str
+@@ -933,24 +962,24 @@ static int try_dests_non(struct file_str
  
  	do {
  		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1604,7 +1631,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				continue;
  			break;
  #endif
-@@ -898,7 +923,7 @@ static int try_dests_non(struct file_str
+@@ -965,7 +994,7 @@ static int try_dests_non(struct file_str
  		case TYPE_SPECIAL:
  		case TYPE_DEVICE:
  			devp = F_RDEV_P(file);
@@ -1613,7 +1640,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				continue;
  			break;
  #ifdef SUPPORT_LINKS
-@@ -915,7 +940,11 @@ static int try_dests_non(struct file_str
+@@ -982,7 +1011,11 @@ static int try_dests_non(struct file_str
  			match_level = 2;
  			best_match = j;
  		}
@@ -1626,7 +1653,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			match_level = 3;
  			best_match = j;
  			break;
-@@ -928,7 +957,7 @@ static int try_dests_non(struct file_str
+@@ -995,7 +1028,7 @@ static int try_dests_non(struct file_str
  	if (j != best_match) {
  		j = best_match;
  		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1635,7 +1662,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			return -1;
  	}
  
-@@ -959,7 +988,15 @@ static int try_dests_non(struct file_str
+@@ -1026,7 +1059,15 @@ static int try_dests_non(struct file_str
  			    : ITEM_LOCAL_CHANGE
  			     + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
  			char *lp = match_level == 3 ? "" : NULL;
@@ -1652,15 +1679,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		}
  		if (verbose > 1 && maybe_ATTRS_REPORT) {
  			rprintf(FCLIENT, "%s%s is uptodate\n",
-@@ -972,6 +1009,7 @@ static int try_dests_non(struct file_str
+@@ -1039,6 +1080,7 @@ static int try_dests_non(struct file_str
  }
  
  static int phase = 0;
 +static int dflt_perms;
  
- /* Acts on the_file_list->file's ndx'th item, whose name is fname.  If a dir,
+ /* Acts on cur_flist->file's ndx'th item, whose name is fname.  If a dir,
   * make sure it exists, and has the right permissions/timestamp info.  For
-@@ -993,7 +1031,8 @@ static void recv_generator(char *fname, 
+@@ -1059,7 +1101,8 @@ static void recv_generator(char *fname, 
  	static int need_fuzzy_dirlist = 0;
  	struct file_struct *fuzzy_file = NULL;
  	int fd = -1, f_copy = -1;
@@ -1670,17 +1697,17 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	struct file_struct *back_file = NULL;
  	int statret, real_ret, stat_errno;
  	char *fnamecmp, *partialptr, *backupptr = NULL;
-@@ -1049,6 +1088,9 @@ static void recv_generator(char *fname, 
- 		} else if (!dry_run)
+@@ -1104,6 +1147,9 @@ static void recv_generator(char *fname, 
  			return;
+ 		}
  	}
 +#ifdef SUPPORT_ACLS
 +	sx.acc_acl = sx.def_acl = NULL;
 +#endif
  	if (dry_run > 1) {
- 		statret = -1;
- 		stat_errno = ENOENT;
-@@ -1056,7 +1098,7 @@ static void recv_generator(char *fname, 
+ 		if (fuzzy_dirlist) {
+ 			flist_free(fuzzy_dirlist);
+@@ -1116,7 +1162,7 @@ static void recv_generator(char *fname, 
  		const char *dn = file->dirname ? file->dirname : ".";
  		if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
  			if (relative_paths && !implied_dirs
@@ -1689,7 +1716,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			 && create_directory_path(fname) < 0) {
  				rsyserr(FERROR, errno,
  					"recv_generator: mkdir %s failed",
-@@ -1068,6 +1110,10 @@ static void recv_generator(char *fname, 
+@@ -1128,6 +1174,10 @@ static void recv_generator(char *fname, 
  			}
  			if (fuzzy_basis)
  				need_fuzzy_dirlist = 1;
@@ -1700,7 +1727,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		}
  		parent_dirname = dn;
  
-@@ -1077,7 +1123,7 @@ static void recv_generator(char *fname, 
+@@ -1137,7 +1187,7 @@ static void recv_generator(char *fname, 
  			need_fuzzy_dirlist = 0;
  		}
  
@@ -1709,7 +1736,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				    keep_dirlinks && S_ISDIR(file->mode));
  		stat_errno = errno;
  	}
-@@ -1095,8 +1141,9 @@ static void recv_generator(char *fname, 
+@@ -1163,8 +1213,9 @@ static void recv_generator(char *fname, 
  	 * mode based on the local permissions and some heuristics. */
  	if (!preserve_perms) {
  		int exists = statret == 0
@@ -1721,7 +1748,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	}
  
  	if (S_ISDIR(file->mode)) {
-@@ -1105,8 +1152,8 @@ static void recv_generator(char *fname, 
+@@ -1173,8 +1224,8 @@ static void recv_generator(char *fname, 
  		 * file of that name and it is *not* a directory, then
  		 * we need to delete it.  If it doesn't exist, then
  		 * (perhaps recursively) create it. */
@@ -1732,7 +1759,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				return;
  			statret = -1;
  		}
-@@ -1115,14 +1162,14 @@ static void recv_generator(char *fname, 
+@@ -1183,14 +1234,14 @@ static void recv_generator(char *fname, 
  			dry_run++;
  		}
  		real_ret = statret;
@@ -1746,10 +1773,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		if (statret != 0 && basis_dir[0] != NULL) {
 -			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
 +			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
- 					      itemizing, maybe_ATTRS_REPORT, code);
+ 					      itemizing, code);
  			if (j == -2) {
  				itemizing = 0;
-@@ -1131,7 +1178,11 @@ static void recv_generator(char *fname, 
+@@ -1199,7 +1250,11 @@ static void recv_generator(char *fname, 
  				statret = 1;
  		}
  		if (itemizing && f_out != -1) {
@@ -1762,8 +1789,12 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
  		}
  		if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
-@@ -1151,22 +1202,22 @@ static void recv_generator(char *fname, 
- 				return;
+@@ -1213,31 +1268,31 @@ static void recv_generator(char *fname, 
+ 				    "*** Skipping any contents from this failed directory ***\n");
+ 				missing_below = F_DEPTH(file);
+ 				file->flags |= FLAG_MISSING_DIR;
+-				return;
++				goto cleanup;
  			}
  		}
 -		if (set_file_attrs(fname, file, real_ret ? NULL : &real_st, 0)
@@ -1773,25 +1804,33 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		if (real_ret != 0 && one_file_system)
 -			real_st.st_dev = filesystem_dev;
 +			real_sx.st.st_dev = filesystem_dev;
- 		if (delete_during && f_out != -1 && !phase && dry_run < 2
+ 		if (inc_recurse) {
+ 			if (one_file_system) {
+ 				uint32 *devp = F_DIRDEV_P(file);
+-				DEV_MAJOR(devp) = major(real_st.st_dev);
+-				DEV_MINOR(devp) = minor(real_st.st_dev);
++				DEV_MAJOR(devp) = major(real_sx.st.st_dev);
++				DEV_MINOR(devp) = minor(real_sx.st.st_dev);
+ 			}
+ 		}
+ 		else if (delete_during && f_out != -1 && !phase && dry_run < 2
  		    && (file->flags & FLAG_XFER_DIR))
--			delete_in_dir(the_file_list, fname, file, &real_st);
+-			delete_in_dir(cur_flist, fname, file, &real_st.st_dev);
 -		return;
-+			delete_in_dir(the_file_list, fname, file, &real_sx.st);
++			delete_in_dir(cur_flist, fname, file, &real_sx.st.st_dev);
 +		goto cleanup;
  	}
  
  #ifdef SUPPORT_HARD_LINKS
- 	if (preserve_hard_links && F_IS_HLINKED(file)
--	    && hard_link_check(file, ndx, fname, statret, &st,
-+	    && hard_link_check(file, ndx, fname, statret, &sx,
- 			       itemizing, code, HL_CHECK_MASTER))
+ 	if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
+-	 && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
 -		return;
++	 && hard_link_check(file, ndx, fname, statret, &sx, itemizing, code))
 +		goto cleanup;
  #endif
  
  	if (preserve_links && S_ISLNK(file->mode)) {
-@@ -1186,14 +1237,14 @@ static void recv_generator(char *fname, 
+@@ -1257,28 +1312,28 @@ static void recv_generator(char *fname, 
  			char lnk[MAXPATHLEN];
  			int len;
  
@@ -1808,30 +1847,45 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +				set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
  #ifdef SUPPORT_HARD_LINKS
  				if (preserve_hard_links && F_IS_HLINKED(file))
- 					hard_link_cluster(file, ndx, itemizing, code, -1);
-@@ -1204,10 +1255,10 @@ static void recv_generator(char *fname, 
+-					finish_hard_link(file, fname, &st, itemizing, code, -1);
++					finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
+ #endif
+ 				if (remove_source_files == 1)
+ 					goto return_with_success;
+-				return;
++				goto cleanup;
  			}
  			/* Not the right symlink (or not a symlink), so
  			 * delete it. */
 -			if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0)
+-				return;
 +			if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0)
- 				return;
++				goto cleanup;
  		} else if (basis_dir[0] != NULL) {
 -			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
 +			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
- 					      itemizing, maybe_ATTRS_REPORT, code);
+ 					      itemizing, code);
  			if (j == -2) {
  #ifndef CAN_HARDLINK_SYMLINK
-@@ -1224,7 +1275,7 @@ static void recv_generator(char *fname, 
+@@ -1287,7 +1342,7 @@ static void recv_generator(char *fname, 
+ 				} else
+ #endif
+ 				if (!copy_dest)
+-					return;
++					goto cleanup;
+ 				itemizing = 0;
+ 				code = FNONE;
+ 			} else if (j >= 0)
+@@ -1295,7 +1350,7 @@ static void recv_generator(char *fname, 
  		}
  #ifdef SUPPORT_HARD_LINKS
- 		if (preserve_hard_links && F_IS_HLINKED(file)
--		    && hard_link_check(file, ndx, fname, -1, &st,
-+		    && hard_link_check(file, ndx, fname, -1, &sx,
- 				       itemizing, code, HL_SKIP))
- 			return;
+ 		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
+-			return;
++			goto cleanup;
  #endif
-@@ -1234,7 +1285,7 @@ static void recv_generator(char *fname, 
+ 		if (do_symlink(sl, fname) != 0) {
+ 			rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
+@@ -1303,7 +1358,7 @@ static void recv_generator(char *fname, 
  		} else {
  			set_file_attrs(fname, file, NULL, 0);
  			if (itemizing) {
@@ -1840,7 +1894,16 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  					ITEM_LOCAL_CHANGE, 0, NULL);
  			}
  			if (code != FNONE && verbose)
-@@ -1260,33 +1311,38 @@ static void recv_generator(char *fname, 
+@@ -1319,7 +1374,7 @@ static void recv_generator(char *fname, 
+ 				goto return_with_success;
+ 		}
+ #endif
+-		return;
++		goto cleanup;
+ 	}
+ 
+ 	if ((am_root && preserve_devices && IS_DEVICE(file->mode))
+@@ -1329,33 +1384,38 @@ static void recv_generator(char *fname, 
  		if (statret == 0) {
  			char *t;
  			if (IS_DEVICE(file->mode)) {
@@ -1855,9 +1918,9 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				t = "special file";
  			}
  			if (statret == 0
--			 && (st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS)
+-			 && BITS_EQUAL(st.st_mode, file->mode, _S_IFMT)
 -			 && st.st_rdev == rdev) {
-+			 && (sx.st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS)
++			 && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT)
 +			 && sx.st.st_rdev == rdev) {
  				/* The device or special file is identical. */
 -				if (itemizing)
@@ -1873,7 +1936,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +				set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
  #ifdef SUPPORT_HARD_LINKS
  				if (preserve_hard_links && F_IS_HLINKED(file))
- 					hard_link_cluster(file, ndx, itemizing, code, -1);
+-					finish_hard_link(file, fname, &st, itemizing, code, -1);
++					finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
  #endif
  				if (remove_source_files == 1)
  					goto return_with_success;
@@ -1881,24 +1945,34 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +				goto cleanup;
  			}
 -			if (delete_item(fname, st.st_mode, t, del_opts) != 0)
+-				return;
 +			if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0)
- 				return;
++				goto cleanup;
  		} else if (basis_dir[0] != NULL) {
 -			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
 +			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
- 					      itemizing, maybe_ATTRS_REPORT, code);
+ 					      itemizing, code);
  			if (j == -2) {
  #ifndef CAN_HARDLINK_SPECIAL
-@@ -1303,7 +1359,7 @@ static void recv_generator(char *fname, 
+@@ -1364,7 +1424,7 @@ static void recv_generator(char *fname, 
+ 				} else
+ #endif
+ 				if (!copy_dest)
+-					return;
++					goto cleanup;
+ 				itemizing = 0;
+ 				code = FNONE;
+ 			} else if (j >= 0)
+@@ -1372,7 +1432,7 @@ static void recv_generator(char *fname, 
  		}
  #ifdef SUPPORT_HARD_LINKS
- 		if (preserve_hard_links && F_IS_HLINKED(file)
--		    && hard_link_check(file, ndx, fname, -1, &st,
-+		    && hard_link_check(file, ndx, fname, -1, &sx,
- 				       itemizing, code, HL_SKIP))
- 			return;
+ 		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
+-			return;
++			goto cleanup;
  #endif
-@@ -1318,7 +1374,11 @@ static void recv_generator(char *fname, 
+ 		if (verbose > 2) {
+ 			rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n",
+@@ -1385,7 +1445,11 @@ static void recv_generator(char *fname, 
  		} else {
  			set_file_attrs(fname, file, NULL, 0);
  			if (itemizing) {
@@ -1911,7 +1985,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  					ITEM_LOCAL_CHANGE, 0, NULL);
  			}
  			if (code != FNONE && verbose)
-@@ -1330,7 +1390,7 @@ static void recv_generator(char *fname, 
+@@ -1397,14 +1461,14 @@ static void recv_generator(char *fname, 
  			if (remove_source_files == 1)
  				goto return_with_success;
  		}
@@ -1920,24 +1994,56 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	}
  
  	if (!S_ISREG(file->mode)) {
-@@ -1364,7 +1424,7 @@ static void recv_generator(char *fname, 
+ 		if (solo_file)
+ 			fname = f_name(file, NULL);
+ 		rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
+-		return;
++		goto cleanup;
  	}
  
- 	if (update_only && statret == 0
+ 	if (max_size > 0 && F_LENGTH(file) > max_size) {
+@@ -1413,7 +1477,7 @@ static void recv_generator(char *fname, 
+ 				fname = f_name(file, NULL);
+ 			rprintf(FINFO, "%s is over max-size\n", fname);
+ 		}
+-		return;
++		goto cleanup;
+ 	}
+ 	if (min_size > 0 && F_LENGTH(file) < min_size) {
+ 		if (verbose > 1) {
+@@ -1421,39 +1485,39 @@ static void recv_generator(char *fname, 
+ 				fname = f_name(file, NULL);
+ 			rprintf(FINFO, "%s is under min-size\n", fname);
+ 		}
+-		return;
++		goto cleanup;
+ 	}
+ 
+ 	if (ignore_existing > 0 && statret == 0) {
+ 		if (verbose > 1)
+ 			rprintf(FINFO, "%s exists\n", fname);
+-		return;
++		goto cleanup;
+ 	}
+ 
+ 	if (update_only > 0 && statret == 0
 -	    && cmp_time(st.st_mtime, file->modtime) > 0) {
 +	    && cmp_time(sx.st.st_mtime, file->modtime) > 0) {
  		if (verbose > 1)
  			rprintf(FINFO, "%s is newer\n", fname);
- 		return;
-@@ -1373,20 +1433,20 @@ static void recv_generator(char *fname, 
+-		return;
++		goto cleanup;
+ 	}
+ 
  	fnamecmp = fname;
  	fnamecmp_type = FNAMECMP_FNAME;
  
 -	if (statret == 0 && !S_ISREG(st.st_mode)) {
 -		if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0)
+-			return;
 +	if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
 +		if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0)
- 			return;
++			goto cleanup;
  		statret = -1;
  		stat_errno = ENOENT;
  	}
@@ -1945,7 +2051,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	if (statret != 0 && basis_dir[0] != NULL) {
 -		int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
 +		int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx,
- 				      itemizing, maybe_ATTRS_REPORT, code);
+ 				      itemizing, code);
  		if (j == -2) {
  			if (remove_source_files == 1)
  				goto return_with_success;
@@ -1954,7 +2060,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		}
  		if (j >= 0) {
  			fnamecmp = fnamecmpbuf;
-@@ -1396,7 +1456,7 @@ static void recv_generator(char *fname, 
+@@ -1463,7 +1527,7 @@ static void recv_generator(char *fname, 
  	}
  
  	real_ret = statret;
@@ -1963,7 +2069,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
  	    && link_stat(partialptr, &partial_st, 0) == 0
-@@ -1415,7 +1475,7 @@ static void recv_generator(char *fname, 
+@@ -1482,7 +1546,7 @@ static void recv_generator(char *fname, 
  				rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
  					fname, fnamecmpbuf);
  			}
@@ -1972,22 +2078,25 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			statret = 0;
  			fnamecmp = fnamecmpbuf;
  			fnamecmp_type = FNAMECMP_FUZZY;
-@@ -1425,7 +1485,7 @@ static void recv_generator(char *fname, 
+@@ -1492,45 +1556,50 @@ static void recv_generator(char *fname, 
  	if (statret != 0) {
  #ifdef SUPPORT_HARD_LINKS
- 		if (preserve_hard_links && F_IS_HLINKED(file)
--		    && hard_link_check(file, ndx, fname, statret, &st,
-+		    && hard_link_check(file, ndx, fname, statret, &sx,
- 				       itemizing, code, HL_SKIP))
- 			return;
+ 		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
+-			return;
++			goto cleanup;
  #endif
-@@ -1436,38 +1496,51 @@ static void recv_generator(char *fname, 
- 		return;
+ 		if (stat_errno == ENOENT)
+ 			goto notify_others;
+ 		rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
+ 			full_fname(fname));
+-		return;
++		goto cleanup;
  	}
  
--	if (append_mode && st.st_size > F_LENGTH(file))
-+	if (append_mode && sx.st.st_size > F_LENGTH(file))
- 		return;
+-	if (append_mode > 0 && st.st_size > F_LENGTH(file))
+-		return;
++	if (append_mode > 0 && sx.st.st_size > F_LENGTH(file))
++		goto cleanup;
  
  	if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
  		;
@@ -1999,36 +2108,28 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			do_unlink(partialptr);
  			handle_partial_dir(partialptr, PDIR_DELETE);
  		}
- 		if (itemizing) {
--			itemize(file, ndx, real_ret, &real_st,
-+#ifdef SUPPORT_ACLS
-+			if (preserve_acls && real_ret == 0)
-+				get_acl(fnamecmp, &real_sx);
-+#endif
-+			itemize(file, ndx, real_ret, &real_sx,
- 				0, 0, NULL);
+-		if (itemizing)
+-			itemize(file, ndx, statret, &st, 0, 0, NULL);
+-		set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
++		if (itemizing) {
 +#ifdef SUPPORT_ACLS
-+			if (preserve_acls) {
-+				if (fnamecmp_type == FNAMECMP_FNAME) {
-+					sx.acc_acl = real_sx.acc_acl;
-+					sx.def_acl = real_sx.def_acl;
-+				} else
-+					free_acl(&real_sx);
-+			}
++			if (preserve_acls && statret == 0)
++				get_acl(fnamecmp, &sx);
 +#endif
- 		}
--		set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
++			itemize(file, ndx, statret, &sx, 0, 0, NULL);
++		}
 +		set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
  #ifdef SUPPORT_HARD_LINKS
  		if (preserve_hard_links && F_IS_HLINKED(file))
- 			hard_link_cluster(file, ndx, itemizing, code, -1);
+-			finish_hard_link(file, fname, &st, itemizing, code, -1);
++			finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
  #endif
  		if (remove_source_files != 1)
 -			return;
 +			goto cleanup;
  	  return_with_success:
  		if (!dry_run)
- 			send_msg_int(MSG_SUCCESS, ndx);
+ 			send_msg_int(MSG_SUCCESS, ndx + cur_flist->ndx_start);
 -		return;
 +		goto cleanup;
  	}
@@ -2040,13 +2141,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		fnamecmp = partialptr;
  		fnamecmp_type = FNAMECMP_PARTIAL_DIR;
  		statret = 0;
-@@ -1492,18 +1565,22 @@ static void recv_generator(char *fname, 
+@@ -1555,16 +1624,20 @@ static void recv_generator(char *fname, 
  		/* pretend the file didn't exist */
  #ifdef SUPPORT_HARD_LINKS
- 		if (preserve_hard_links && F_IS_HLINKED(file)
--		    && hard_link_check(file, ndx, fname, statret, &st,
-+		    && hard_link_check(file, ndx, fname, statret, &sx,
- 				       itemizing, code, HL_SKIP))
+ 		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
 -			return;
 +			goto cleanup;
  #endif
@@ -2058,7 +2156,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		goto notify_others;
  	}
  
- 	if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) {
+ 	if (inplace && make_backups > 0 && fnamecmp_type == FNAMECMP_FNAME) {
  		if (!(backupptr = get_backup_name(fname))) {
  			close(fd);
 -			return;
@@ -2066,7 +2164,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		}
  		if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
  			close(fd);
-@@ -1514,7 +1591,7 @@ static void recv_generator(char *fname, 
+@@ -1575,7 +1648,7 @@ static void recv_generator(char *fname, 
  				full_fname(backupptr));
  			unmake_file(back_file);
  			close(fd);
@@ -2075,7 +2173,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		}
  		if ((f_copy = do_open(backupptr,
  		    O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
-@@ -1522,14 +1599,14 @@ static void recv_generator(char *fname, 
+@@ -1583,14 +1656,14 @@ static void recv_generator(char *fname, 
  				full_fname(backupptr));
  			unmake_file(back_file);
  			close(fd);
@@ -2092,7 +2190,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	}
  
  	if (verbose > 2)
-@@ -1547,8 +1624,16 @@ static void recv_generator(char *fname, 
+@@ -1614,26 +1687,34 @@ static void recv_generator(char *fname, 
  			iflags |= ITEM_BASIS_TYPE_FOLLOWS;
  		if (fnamecmp_type == FNAMECMP_FUZZY)
  			iflags |= ITEM_XNAME_FOLLOWS;
@@ -2102,7 +2200,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +			get_acl(fnamecmp, &real_sx);
 +#endif
 +		itemize(file, -1, real_ret, &real_sx, iflags, fnamecmp_type,
- 			fuzzy_file ? F_BASENAME(fuzzy_file) : NULL);
+ 			fuzzy_file ? fuzzy_file->basename : NULL);
 +#ifdef SUPPORT_ACLS
 +		if (preserve_acls)
 +			free_acl(&real_sx);
@@ -2110,9 +2208,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	}
  
  	if (!do_xfers) {
-@@ -1556,17 +1641,17 @@ static void recv_generator(char *fname, 
+ #ifdef SUPPORT_HARD_LINKS
  		if (preserve_hard_links && F_IS_HLINKED(file))
- 			hard_link_cluster(file, ndx, itemizing, code, -1);
+-			finish_hard_link(file, fname, &st, itemizing, code, -1);
++			finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
  #endif
 -		return;
 +		goto cleanup;
@@ -2132,7 +2231,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	if (f_copy >= 0) {
  		close(f_copy);
-@@ -1579,6 +1664,13 @@ static void recv_generator(char *fname, 
+@@ -1646,6 +1727,13 @@ static void recv_generator(char *fname, 
  	}
  
  	close(fd);
@@ -2145,16 +2244,16 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	return;
  }
  
- void generate_files(int f_out, struct file_list *flist, char *local_name)
-@@ -1640,6 +1732,8 @@ void generate_files(int f_out, struct fi
+ static void touch_up_dirs(struct file_list *flist, int ndx,
+@@ -1742,6 +1830,8 @@ void generate_files(int f_out, char *loc
  	 * notice that and let us know via the redo pipe (or its closing). */
  	ignore_timeout = 1;
  
 +	dflt_perms = (ACCESSPERMS & ~orig_umask);
 +
- 	for (i = 0; i < flist->count; i++) {
- 		struct file_struct *file = flist->files[i];
- 
+ 	do {
+ 		if (inc_recurse && delete_during && cur_flist->ndx_start) {
+ 			struct file_struct *fp = dir_flist->files[cur_flist->parent_ndx];
 --- old/hlink.c
 +++ new/hlink.c
 @@ -27,6 +27,7 @@ extern int verbose;
@@ -2163,22 +2262,22 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  extern int link_dest;
 +extern int preserve_acls;
  extern int make_backups;
+ extern int protocol_version;
  extern int remove_source_files;
- extern int stdout_format_has_i;
-@@ -150,15 +151,19 @@ void init_hard_links(void)
+@@ -268,15 +269,19 @@ void match_hard_links(void)
  }
  
  static int maybe_hard_link(struct file_struct *file, int ndx,
 -			   const char *fname, int statret, STRUCT_STAT *stp,
 +			   const char *fname, int statret, statx *sxp,
- 			   const char *toname, STRUCT_STAT *to_stp,
- 			   int itemizing, enum logcode code)
+ 			   const char *oldname, STRUCT_STAT *old_stp,
+ 			   const char *realname, int itemizing, enum logcode code)
  {
  	if (statret == 0) {
--		if (stp->st_dev == to_stp->st_dev
--		 && stp->st_ino == to_stp->st_ino) {
-+		if (sxp->st.st_dev == to_stp->st_dev
-+		 && sxp->st.st_ino == to_stp->st_ino) {
+-		if (stp->st_dev == old_stp->st_dev
+-		 && stp->st_ino == old_stp->st_ino) {
++		if (sxp->st.st_dev == old_stp->st_dev
++		 && sxp->st.st_ino == old_stp->st_ino) {
  			if (itemizing) {
 -				itemize(file, ndx, statret, stp,
 +#ifdef SUPPORT_ACLS
@@ -2189,107 +2288,133 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  					ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
  					0, "");
  			}
-@@ -173,12 +178,12 @@ static int maybe_hard_link(struct file_s
- 			return -1;
- 		}
- 	}
--	return hard_link_one(file, ndx, fname, statret, stp, toname,
-+	return hard_link_one(file, ndx, fname, statret, sxp, toname,
- 			     0, itemizing, code);
- }
+@@ -297,7 +302,11 @@ static int maybe_hard_link(struct file_s
  
+ 	if (hard_link_one(file, fname, oldname, 0)) {
+ 		if (itemizing) {
+-			itemize(file, ndx, statret, stp,
++#ifdef SUPPORT_ACLS
++			if (preserve_acls && statret == 0 && !ACL_READY(*sxp))
++				get_acl(fname, sxp);
++#endif
++			itemize(file, ndx, statret, sxp,
+ 				ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
+ 				realname);
+ 		}
+@@ -311,7 +320,7 @@ static int maybe_hard_link(struct file_s
+ /* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not.  Returns:
+  * 0 = process the file, 1 = skip the file, -1 = error occurred. */
  int hard_link_check(struct file_struct *file, int ndx, const char *fname,
 -		    int statret, STRUCT_STAT *stp, int itemizing,
 +		    int statret, statx *sxp, int itemizing,
- 		    enum logcode code, int skip)
+ 		    enum logcode code)
  {
- 	int head;
-@@ -221,7 +226,7 @@ int hard_link_check(struct file_struct *
- 						 || st2.st_ino != st3.st_ino)
- 							continue;
- 						statret = 1;
--						stp = &st3;
-+						sxp->st = st3;
- 						if (verbose < 2 || !stdout_format_has_i) {
- 							itemizing = 0;
- 							code = FNONE;
-@@ -231,12 +236,16 @@ int hard_link_check(struct file_struct *
- 					if (!unchanged_file(cmpbuf, file, &st3))
- 						continue;
- 					statret = 1;
--					stp = &st3;
--					if (unchanged_attrs(file, &st3))
-+					sxp->st = st3;
+ 	STRUCT_STAT prev_st;
+@@ -362,18 +371,20 @@ int hard_link_check(struct file_struct *
+ 	if (statret < 0 && basis_dir[0] != NULL) {
+ 		/* If we match an alt-dest item, we don't output this as a change. */
+ 		char cmpbuf[MAXPATHLEN];
+-		STRUCT_STAT alt_st;
++		statx alt_sx;
+ 		int j = 0;
 +#ifdef SUPPORT_ACLS
-+					if (preserve_acls)
-+						get_acl(cmpbuf, sxp);
++		alt_sx.acc_acl = alt_sx.def_acl = NULL;
 +#endif
-+					if (unchanged_attrs(file, sxp))
- 						break;
- 				} while (basis_dir[++j] != NULL);
+ 		do {
+ 			pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+-			if (link_stat(cmpbuf, &alt_st, 0) < 0)
++			if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
+ 				continue;
+ 			if (link_dest) {
+-				if (prev_st.st_dev != alt_st.st_dev
+-				 || prev_st.st_ino != alt_st.st_ino)
++				if (prev_st.st_dev != alt_sx.st.st_dev
++				 || prev_st.st_ino != alt_sx.st.st_ino)
+ 					continue;
+ 				statret = 1;
+-				*stp = alt_st;
+ 				if (verbose < 2 || !stdout_format_has_i) {
+ 					itemizing = 0;
+ 					code = FNONE;
+@@ -382,16 +393,36 @@ int hard_link_check(struct file_struct *
+ 				}
+ 				break;
  			}
--			maybe_hard_link(file, ndx, fname, statret, stp,
-+			maybe_hard_link(file, ndx, fname, statret, sxp,
- 					toname, &st2, itemizing, code);
- 			if (remove_source_files == 1 && do_xfers)
- 				send_msg_int(MSG_SUCCESS, ndx);
-@@ -249,7 +258,7 @@ int hard_link_check(struct file_struct *
- }
- 
- int hard_link_one(struct file_struct *file, int ndx, const char *fname,
--		  int statret, STRUCT_STAT *stp, const char *toname, int terse,
-+		  int statret, statx *sxp, const char *toname, int terse,
- 		  int itemizing, enum logcode code)
- {
- 	if (do_link(toname, fname)) {
-@@ -265,7 +274,11 @@ int hard_link_one(struct file_struct *fi
- 	}
- 
- 	if (itemizing) {
--		itemize(file, ndx, statret, stp,
+-			if (!unchanged_file(cmpbuf, file, &alt_st))
++			if (!unchanged_file(cmpbuf, file, &alt_sx.st))
+ 				continue;
+ 			statret = 1;
+-			*stp = alt_st;
+-			if (unchanged_attrs(file, &alt_st))
 +#ifdef SUPPORT_ACLS
-+		if (preserve_acls && statret == 0 && !ACL_READY(*sxp))
-+			get_acl(fname, sxp);
++			if (preserve_acls)
++				get_acl(cmpbuf, &alt_sx);
++#endif
++			if (unchanged_attrs(file, &alt_sx))
+ 				break;
+ 		} while (basis_dir[++j] != NULL);
++		if (statret == 1) {
++			sxp->st = alt_sx.st;
++#ifdef SUPPORT_ACLS
++			if (preserve_acls) {
++				if (!ACL_READY(*sxp))
++					get_acl(cmpbuf, sxp);
++				else {
++					sxp->acc_acl = alt_sx.acc_acl;
++					sxp->def_acl = alt_sx.def_acl;
++				}
++			}
++#endif
++		}
++#ifdef SUPPORT_ACLS
++		else if (preserve_acls)
++			free_acl(&alt_sx);
 +#endif
-+		itemize(file, ndx, statret, sxp,
- 			ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
- 			terse ? "" : toname);
  	}
-@@ -279,14 +292,15 @@ void hard_link_cluster(struct file_struc
+ 
+-	if (maybe_hard_link(file, ndx, fname, statret, stp, prev_name, &prev_st,
++	if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
+ 			    realname, itemizing, code) < 0)
+ 		return -1;
+ 
+@@ -426,7 +457,8 @@ void finish_hard_link(struct file_struct
+ 		      STRUCT_STAT *stp, int itemizing, enum logcode code,
+ 		      int alt_dest)
  {
- 	char hlink1[MAXPATHLEN];
- 	char *hlink2;
--	STRUCT_STAT st1, st2;
-+	statx sx;
+-	STRUCT_STAT st, prev_st;
++	statx prev_sx;
 +	STRUCT_STAT st;
- 	int statret, ndx = master;
- 	struct hlist *hl = F_HL_LIST(file);
+ 	char alt_name[MAXPATHLEN], *prev_name;
+ 	const char *our_name;
+ 	int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
+@@ -450,14 +482,24 @@ void finish_hard_link(struct file_struct
+ 	} else
+ 		our_name = fname;
  
- 	hl->hlindex = FINISHED_LINK;
- 	if (dry_run)
- 		hl->dest_used = dest_used + 1;
--	if (link_stat(f_name(file, hlink1), &st1, 0) < 0)
-+	if (link_stat(f_name(file, hlink1), &st, 0) < 0)
- 		return;
- 	if (!(file->flags & FLAG_HLINK_FIRST)) {
- 		while (!(file->flags & FLAG_HLINK_LAST)) {
-@@ -302,9 +316,13 @@ void hard_link_cluster(struct file_struc
- 		if (hl->hlindex != SKIPPED_LINK)
- 			continue;
- 		hlink2 = f_name(file, NULL);
--		statret = link_stat(hlink2, &st2, 0);
--		maybe_hard_link(file, ndx, hlink2, statret, &st2,
--				hlink1, &st1, itemizing, code);
-+		statret = link_stat(hlink2, &sx.st, 0);
-+		maybe_hard_link(file, ndx, hlink2, statret, &sx,
-+				hlink1, &st, itemizing, code);
++#ifdef SUPPORT_ACLS
++	prev_sx.acc_acl = prev_sx.def_acl = NULL;
++#endif
++
+ 	while ((ndx = prev_ndx) >= 0) {
++		int val;
+ 		file = FPTR(ndx);
+ 		file->flags = (file->flags & ~FLAG_HLINK_FIRST) | FLAG_HLINK_DONE;
+ 		prev_ndx = F_HL_PREV(file);
+ 		prev_name = f_name(file, NULL);
+-		prev_statret = link_stat(prev_name, &prev_st, 0);
+-		if (maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_st,
+-				    our_name, stp, fname, itemizing, code) < 0)
++		prev_statret = link_stat(prev_name, &prev_sx.st, 0);
++		val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
++				      our_name, stp, fname, itemizing, code);
 +#ifdef SUPPORT_ACLS
 +		if (preserve_acls)
-+			free_acl(&sx);
++			free_acl(&prev_sx);
 +#endif
++		if (val < 0)
+ 			continue;
  		if (remove_source_files == 1 && do_xfers)
  			send_msg_int(MSG_SUCCESS, ndx);
- 		hl->hlindex = FINISHED_LINK;
 --- old/lib/sysacls.c
 +++ new/lib/sysacls.c
 @@ -0,0 +1,3251 @@
@@ -5671,7 +5796,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
    {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },
    {"no-times",         0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
    {"no-t",             0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
-@@ -1087,6 +1099,24 @@ int parse_arguments(int *argc, const cha
+@@ -1093,6 +1105,24 @@ int parse_arguments(int *argc, const cha
  			usage(FINFO);
  			exit_cleanup(0);
  
@@ -5696,37 +5821,28 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -1223,6 +1253,8 @@ int parse_arguments(int *argc, const cha
- 		preserve_uid = ++flist_extra_cnt;
- 	if (preserve_gid)
- 		preserve_gid = ++flist_extra_cnt;
-+	if (preserve_acls)
-+		preserve_acls = ++flist_extra_cnt;
- 
- 	*argv = poptGetArgs(pc);
- 	*argc = count_args(*argv);
-@@ -1534,6 +1566,10 @@ void server_options(char **args,int *arg
- 
- 	if (preserve_hard_links)
- 		argstr[x++] = 'H';
+@@ -1556,6 +1586,10 @@ void server_options(char **args,int *arg
+ 		argstr[x++] = 'p';
+ 	else if (preserve_executability && am_sender)
+ 		argstr[x++] = 'E';
 +#ifdef SUPPORT_ACLS
 +	if (preserve_acls)
 +		argstr[x++] = 'A';
 +#endif
- 	if (preserve_uid)
- 		argstr[x++] = 'o';
- 	if (preserve_gid)
+ 	if (recurse)
+ 		argstr[x++] = 'r';
+ 	if (always_checksum)
 --- old/receiver.c
 +++ new/receiver.c
-@@ -47,6 +47,7 @@ extern int keep_partial;
+@@ -48,6 +48,7 @@ extern int keep_partial;
  extern int checksum_seed;
  extern int inplace;
  extern int delay_updates;
 +extern mode_t orig_umask;
  extern struct stats stats;
- extern char *stdout_format;
  extern char *tmpdir;
-@@ -347,6 +348,10 @@ int recv_files(int f_in, struct file_lis
+ extern char *partial_dir;
+@@ -348,6 +349,10 @@ int recv_files(int f_in, char *local_nam
  	int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
  	enum logcode log_code = log_before_transfer ? FLOG : FINFO;
  	int max_phase = protocol_version >= 29 ? 2 : 1;
@@ -5737,7 +5853,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	int ndx, recv_ok;
  
  	if (verbose > 2)
-@@ -550,7 +555,16 @@ int recv_files(int f_in, struct file_lis
+@@ -563,7 +568,16 @@ int recv_files(int f_in, char *local_nam
  		 * mode based on the local permissions and some heuristics. */
  		if (!preserve_perms) {
  			int exists = fd1 != -1;
@@ -5765,15 +5881,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  extern int preserve_perms;
  extern int preserve_executability;
  extern int preserve_times;
-@@ -48,7 +49,6 @@ extern int preserve_gid;
- extern int inplace;
+@@ -50,7 +51,6 @@ extern int inplace;
+ extern int flist_eof;
  extern int keep_dirlinks;
  extern int make_backups;
 -extern mode_t orig_umask;
- extern struct stats stats;
- extern struct file_list *the_file_list;
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct chmod_mode_struct *daemon_chmod_modes;
-@@ -153,7 +153,8 @@ void free_sums(struct sum_struct *s)
+ 
+@@ -202,7 +202,8 @@ void free_sums(struct sum_struct *s)
  
  /* This is only called when we aren't preserving permissions.  Figure out what
   * the permissions should be and return them merged back into the mode. */
@@ -5783,7 +5899,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  {
  	int new_mode;
  	/* If the file already exists, we'll return the local permissions,
-@@ -170,56 +171,65 @@ mode_t dest_mode(mode_t flist_mode, mode
+@@ -219,56 +220,65 @@ mode_t dest_mode(mode_t flist_mode, mode
  				new_mode |= (new_mode & 0444) >> 2;
  		}
  	} else {
@@ -5864,7 +5980,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		;
  	else
  #endif
-@@ -229,45 +239,57 @@ int set_file_attrs(char *fname, struct f
+@@ -278,45 +288,57 @@ int set_file_attrs(char *fname, struct f
  				rprintf(FINFO,
  					"set uid of %s from %ld to %ld\n",
  					fname,
@@ -5920,8 +6036,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +#endif
 +
  #ifdef HAVE_CHMOD
--	if ((st->st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) {
-+	if ((sxp->st.st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) {
+-	if (!BITS_EQUAL(st->st_mode, new_mode, CHMOD_BITS)) {
++	if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
  		int ret = do_chmod(fname, new_mode);
  		if (ret < 0) {
  			rsyserr(FERROR, errno,
@@ -5932,7 +6048,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		}
  		if (ret == 0) /* ret == 1 if symlink could not be set */
  			updated = 1;
-@@ -280,6 +302,11 @@ int set_file_attrs(char *fname, struct f
+@@ -329,6 +351,11 @@ int set_file_attrs(char *fname, struct f
  		else
  			rprintf(FCLIENT, "%s is uptodate\n", fname);
  	}
@@ -5946,7 +6062,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
 --- old/rsync.h
 +++ new/rsync.h
-@@ -496,6 +496,14 @@ struct idev {
+@@ -546,6 +546,14 @@ struct idev_node {
  #define IN_LOOPBACKNET 127
  #endif
  
@@ -5960,21 +6076,29 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +
  #define GID_NONE ((gid_t)-1)
  
- #define HL_CHECK_MASTER	0
-@@ -553,10 +561,12 @@ extern int preserve_gid;
+ union file_extras {
+@@ -565,6 +573,7 @@ struct file_struct {
+ extern int file_extra_cnt;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_acls;
+ 
+ #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
+ #define EXTRA_LEN (sizeof (union file_extras))
+@@ -597,10 +606,12 @@ extern int preserve_gid;
  /* When the associated option is on, all entries will have these present: */
- #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid
- #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid
+ #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
+ #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
 +#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
  
  /* These items are per-entry optional and mutally exclusive: */
- #define F_HL_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
- #define F_HL_LIST(f) OPT_EXTRA(f, LEN64_BUMP(f))->hlist
+ #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
+ #define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
 +#define F_DEF_ACL(f) OPT_EXTRA(f, LEN64_BUMP(f))->unum
+ #define F_DIRDEV_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) + 2 - 1)->unum)
+ #define F_DIRNODE_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) + 3 - 1)->num)
  
- /* This optional item might follow an F_HL_*() item.
-  * (Note: a device doesn't need to check LEN64_BUMP(f).) */
-@@ -694,6 +704,17 @@ struct stats {
+@@ -752,6 +763,17 @@ struct stats {
  
  struct chmod_mode_struct;
  
@@ -5992,7 +6116,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  #include "byteorder.h"
  #include "lib/mdfour.h"
  #include "lib/wildmatch.h"
-@@ -712,6 +733,16 @@ struct chmod_mode_struct;
+@@ -770,6 +792,16 @@ struct chmod_mode_struct;
  #define NORETURN __attribute__((__noreturn__))
  #endif
  
@@ -6028,7 +6152,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
   -o, --owner                 preserve owner (super-user only)
   -g, --group                 preserve group
       --devices               preserve device files (super-user only)
-@@ -754,7 +755,9 @@ quote(itemization(
+@@ -771,7 +772,9 @@ quote(itemization(
    permissions, though the bf(--executability) option might change just
    the execute permission for the file.
    it() New files get their "normal" permission bits set to the source
@@ -6039,7 +6163,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
    their special permission bits disabled except in the case where a new
    directory inherits a setgid bit from its parent directory.
  ))
-@@ -785,9 +788,11 @@ The preservation of the destination's se
+@@ -802,9 +805,11 @@ The preservation of the destination's se
  directories when bf(--perms) is off was added in rsync 2.6.7.  Older rsync
  versions erroneously preserved the three special permission bits for
  newly-created files when bf(--perms) was off, while overriding the
@@ -6054,7 +6178,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  dit(bf(-E, --executability)) This option causes rsync to preserve the
  executability (or non-executability) of regular files when bf(--perms) is
-@@ -805,6 +810,15 @@ quote(itemization(
+@@ -822,6 +827,14 @@ quote(itemization(
  
  If bf(--perms) is enabled, this option is ignored.
  
@@ -6062,15 +6186,14 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +ACLs to be the same as the source ACLs.  This nonstandard option only
 +works if the remote rsync also supports it.  bf(--acls) implies bf(--perms).
 +
-+Note also that an optimization of the ACL-sending protocol used by this
-+version makes it incompatible with sending files to an older ACL-enabled
-+rsync unless you double the bf(--acls) option (e.g. bf(-AA)).  This
-+doubling is not needed when pulling files from an older rsync.
++The ACL-sending protocol used by this version was first introduced in
++the patch that was shipped with 2.6.8.  Sending ACLs to an older version
++of the ACL patch is not supported.
 +
  dit(bf(--chmod)) This option tells rsync to apply one or more
  comma-separated "chmod" strings to the permission of the files in the
  transfer.  The resulting value is treated as though it was the permissions
-@@ -1402,8 +1416,8 @@ if the receiving rsync is at least versi
+@@ -1432,8 +1445,8 @@ if the receiving rsync is at least versi
  with older versions of rsync, but that also turns on the output of other
  verbose messages).
  
@@ -6081,7 +6204,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  type of update being done, bf(X) is replaced by the file-type, and the
  other letters represent attributes that may be output if they are being
  modified.
-@@ -1452,7 +1466,11 @@ quote(itemization(
+@@ -1482,7 +1495,11 @@ quote(itemization(
    sender's value (requires bf(--owner) and super-user privileges).
    it() A bf(g) means the group is different and is being updated to the
    sender's value (requires bf(--group) and the authority to set the group).
@@ -6563,24 +6686,26 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  fi
 --- old/testsuite/itemize.test
 +++ new/testsuite/itemize.test
-@@ -38,15 +38,15 @@ rm -f "$to2dir" "$to2dir.test"
+@@ -47,16 +47,16 @@ rm -f "$to2dir" "$to2dir.test"
  $RSYNC -iplr "$fromdir/" "$todir/" \
      | tee "$outfile"
- cat <<EOT >"$chkfile"
+ sed -e "$sed_cmd" <<EOT >"$chkfile"
 -cd+++++++ ./
 -cd+++++++ bar/
+-cd+++++++ foo/_P30_
 -cd+++++++ bar/baz/
 ->f+++++++ bar/baz/rsync
--cd+++++++ foo/
+-cd+++++++ foo/_P29_
 ->f+++++++ foo/config1
 ->f+++++++ foo/config2
 ->f+++++++ foo/extra
 -cL+++++++ foo/sym -> ../bar/baz/rsync
 +cd+++++++++ ./
 +cd+++++++++ bar/
++cd+++++++++ foo/_P30_
 +cd+++++++++ bar/baz/
 +>f+++++++++ bar/baz/rsync
-+cd+++++++++ foo/
++cd+++++++++ foo/_P29_
 +>f+++++++++ foo/config1
 +>f+++++++++ foo/config2
 +>f+++++++++ foo/extra
@@ -6588,10 +6713,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
  
-@@ -58,10 +58,10 @@ chmod 601 "$fromdir/foo/config2"
+@@ -68,10 +68,10 @@ chmod 601 "$fromdir/foo/config2"
  $RSYNC -iplrH "$fromdir/" "$todir/" \
      | tee "$outfile"
- cat <<EOT >"$chkfile"
+ sed -e "$sed_cmd" <<EOT >"$chkfile"
 ->f..T.... bar/baz/rsync
 ->f..T.... foo/config1
 ->f.sTp... foo/config2
@@ -6603,27 +6728,29 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
  
-@@ -78,11 +78,11 @@ chmod 777 "$todir/bar/baz/rsync"
+@@ -88,12 +88,12 @@ chmod 777 "$todir/bar/baz/rsync"
  $RSYNC -iplrtc "$fromdir/" "$todir/" \
      | tee "$outfile"
- cat <<EOT >"$chkfile"
+ sed -e "$sed_cmd" <<EOT >"$chkfile"
+-.d..t.... foo/_P30_
 -.f..tp... bar/baz/rsync
--.d..t.... foo/
+-.d..t.... foo/_P29_
 -.f..t.... foo/config1
 ->fcstp... foo/config2
 -cL..T.... foo/sym -> ../bar/baz/rsync
++.d..t...... foo/_P30_
 +.f..tp..... bar/baz/rsync
-+.d..t...... foo/
++.d..t...... foo/_P29_
 +.f..t...... foo/config1
 +>fcstp..... foo/config2
 +cL..T...... foo/sym -> ../bar/baz/rsync
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
  
-@@ -107,15 +107,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
+@@ -118,15 +118,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
      | tee "$outfile"
  filter_outfile
- cat <<EOT >"$chkfile"
+ sed -e "$sed_cmd" <<EOT >"$chkfile"
 -.d        ./
 -.d        bar/
 -.d        bar/baz/
@@ -6645,10 +6772,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
  
-@@ -134,8 +134,8 @@ touch "$todir/foo/config2"
+@@ -145,8 +145,8 @@ touch "$todir/foo/config2"
  $RSYNC -iplrtH "$fromdir/" "$todir/" \
      | tee "$outfile"
- cat <<EOT >"$chkfile"
+ sed -e "$sed_cmd" <<EOT >"$chkfile"
 -.f...p... foo/config1
 ->f..t.... foo/config2
 +.f...p..... foo/config1
@@ -6656,10 +6783,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
  
-@@ -143,15 +143,15 @@ $RSYNC -ivvplrtH --copy-dest=../to "$fro
+@@ -154,15 +154,15 @@ $RSYNC -ivvplrtH --copy-dest=../to "$fro
      | tee "$outfile"
  filter_outfile
- cat <<EOT >"$chkfile"
+ sed -e "$sed_cmd" <<EOT >"$chkfile"
 -cd        ./
 -cd        bar/
 -cd        bar/baz/
@@ -6681,19 +6808,19 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
  
-@@ -159,7 +159,7 @@ rm -rf "$to2dir"
+@@ -170,7 +170,7 @@ rm -rf "$to2dir"
  $RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
      | tee "$outfile"
- cat <<EOT >"$chkfile"
+ sed -e "$sed_cmd" <<EOT >"$chkfile"
 -hf        foo/extra => foo/config1
 +hf          foo/extra => foo/config1
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
  
-@@ -186,15 +186,15 @@ $RSYNC -ivvplrtH --link-dest="$todir" "$
+@@ -196,15 +196,15 @@ $RSYNC -ivvplrtH --link-dest="$todir" "$
      | tee "$outfile"
  filter_outfile
- cat <<EOT >"$chkfile"
+ sed -e "$sed_cmd" <<EOT >"$chkfile"
 -cd        ./
 -cd        bar/
 -cd        bar/baz/
@@ -6715,10 +6842,10 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
  
-@@ -236,14 +236,14 @@ filter_outfile
- # TODO fix really-old problem when combining -H with --compare-dest:
- # missing output for foo/extra hard-link (and it might not be updated)!
- cat <<EOT >"$chkfile"
+@@ -244,15 +244,15 @@ $RSYNC -ivvplrtH --compare-dest="$todir"
+     | tee "$outfile"
+ filter_outfile
+ sed -e "$sed_cmd" <<EOT >"$chkfile"
 -cd        ./
 -cd        bar/
 -cd        bar/baz/
@@ -6726,6 +6853,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -cd        foo/
 -.f        foo/config1
 -.f        foo/config2
+-.f        foo/extra
 -.L        foo/sym -> ../bar/baz/rsync
 +cd          ./
 +cd          bar/
@@ -6734,21 +6862,22 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +cd          foo/
 +.f          foo/config1
 +.f          foo/config2
++.f          foo/extra
 +.L          foo/sym -> ../bar/baz/rsync
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
  
 --- old/uidlist.c
 +++ new/uidlist.c
-@@ -35,6 +35,7 @@
- extern int verbose;
+@@ -36,6 +36,7 @@ extern int verbose;
+ extern int am_root;
  extern int preserve_uid;
  extern int preserve_gid;
 +extern int preserve_acls;
  extern int numeric_ids;
- extern int am_root;
  
-@@ -270,7 +271,7 @@ void send_uid_list(int f)
+ struct idlist {
+@@ -272,7 +273,7 @@ void send_uid_list(int f)
  {
  	struct idlist *list;
  
@@ -6757,7 +6886,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		int len;
  		/* we send sequences of uid/byte-length/name */
  		for (list = uidlist; list; list = list->next) {
-@@ -287,7 +288,7 @@ void send_uid_list(int f)
+@@ -289,7 +290,7 @@ void send_uid_list(int f)
  		write_int(f, 0);
  	}
  
@@ -6766,26 +6895,22 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		int len;
  		for (list = gidlist; list; list = list->next) {
  			if (!list->name)
-@@ -308,7 +309,7 @@ void recv_uid_list(int f, struct file_li
+@@ -329,18 +330,28 @@ void recv_uid_list(int f, struct file_li
+ {
  	int id, i;
- 	char *name;
  
 -	if (preserve_uid && !numeric_ids) {
 +	if ((preserve_uid || preserve_acls) && !numeric_ids) {
  		/* read the uid list */
- 		while ((id = read_int(f)) != 0) {
- 			int len = read_byte(f);
-@@ -320,7 +321,7 @@ void recv_uid_list(int f, struct file_li
- 		}
+ 		while ((id = read_int(f)) != 0)
+ 			recv_user_name(f, (uid_t)id);
  	}
  
 -	if (preserve_gid && !numeric_ids) {
 +	if ((preserve_gid || preserve_acls) && !numeric_ids) {
  		/* read the gid list */
- 		while ((id = read_int(f)) != 0) {
- 			int len = read_byte(f);
-@@ -332,6 +333,16 @@ void recv_uid_list(int f, struct file_li
- 		}
+ 		while ((id = read_int(f)) != 0)
+ 			recv_group_name(f, (gid_t)id);
  	}
  
 +#ifdef SUPPORT_ACLS