X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/6250eb3e438201ea6f58e1fd5541273b8eb34534..686ce3aa4f643829bdde0d9908228adb6b541f6d:/acls.diff

diff --git a/acls.diff b/acls.diff
index 7e1e174..94a7cd0 100644
--- a/acls.diff
+++ b/acls.diff
@@ -9,7 +9,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 
 --- old/Makefile.in
 +++ new/Makefile.in
-@@ -25,15 +25,15 @@ VERSION=@VERSION@
+@@ -26,15 +26,15 @@ VERSION=@VERSION@
  .SUFFIXES:
  .SUFFIXES: .c .o
  
@@ -30,7 +30,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,1080 @@
+@@ -0,0 +1,1093 @@
 +/*
 + * Handle passing Access Control Lists between systems.
 + *
@@ -160,9 +160,6 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +{
 +	racl->user_obj = (mode >> 6) & 7;
 +	racl->group_obj = (mode >> 3) & 7;
-+#ifdef ACLS_NEED_MASK
-+	racl->mask = (mode >> 3) & 7;
-+#endif
 +	racl->other = mode & 7;
 +}
 +
@@ -183,23 +180,23 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	return True;
 +}
 +
-+static BOOL rsync_acls_equal(const rsync_acl *racl1, const rsync_acl *racl2)
++static BOOL rsync_acl_equal(const rsync_acl *racl1, const rsync_acl *racl2)
 +{
-+	return (racl1->user_obj == racl2->user_obj
-+	     && racl1->group_obj == racl2->group_obj
-+	     && racl1->mask == racl2->mask
-+	     && racl1->other == racl2->other
-+	     && ida_entries_equal(&racl1->users, &racl2->users)
-+	     && ida_entries_equal(&racl1->groups, &racl2->groups));
++	return racl1->user_obj == racl2->user_obj
++	    && racl1->group_obj == racl2->group_obj
++	    && racl1->mask == racl2->mask
++	    && racl1->other == racl2->other
++	    && ida_entries_equal(&racl1->users, &racl2->users)
++	    && ida_entries_equal(&racl1->groups, &racl2->groups);
 +}
 +
 +/* Are the extended (non-permission-bit) entries equal?  If so, the rest of
 + * the ACL will be handled by the normal mode-preservation code.  This is
 + * only meaningful for access ACLs!  Note: the 1st arg is a fully-populated
 + * rsync_acl, but the 2nd parameter can be a condensed rsync_acl, which means
-+ * that it might have several of its perm objects set to NO_ENTRY. */
-+static BOOL rsync_acls_equal_enough(const rsync_acl *racl1,
-+				    const rsync_acl *racl2, mode_t m)
++ * that it might have several of its permission objects set to NO_ENTRY. */
++static BOOL rsync_acl_equal_enough(const rsync_acl *racl1,
++				   const rsync_acl *racl2, mode_t m)
 +{
 +	if ((racl1->mask ^ racl2->mask) & NO_ENTRY)
 +		return False; /* One has a mask and the other doesn't */
@@ -229,7 +226,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	*racl = empty_rsync_acl;
 +}
 +
-+void free_acls(statx *sxp)
++void free_acl(statx *sxp)
 +{
 +	if (sxp->acc_acl) {
 +		rsync_acl_free(sxp->acc_acl);
@@ -289,7 +286,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +
 +/* === System ACLs === */
 +
-+/* Unpack system acl -> rsync acl verbatim.  Return whether we succeeded. */
++/* Unpack system ACL -> rsync ACL verbatim.  Return whether we succeeded. */
 +static BOOL unpack_smb_acl(rsync_acl *racl, SMB_ACL_T sacl)
 +{
 +	static item_list temp_ida_list = EMPTY_ITEM_LIST;
@@ -363,7 +360,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +				save_idas(&temp_ida_list, racl, prior_list_type);
 +			prior_list_type = tag_type;
 +		}
-+		ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, 0);
++		ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, -10);
 +		ida->id = *((id_t *)qualifier);
 +		ida->access = access;
 +		sys_acl_free_qualifier(qualifier, tag_type);
@@ -380,7 +377,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	sort_ida_entries(&racl->groups);
 +
 +#ifdef ACLS_NEED_MASK
-+	if (!racl->users.count && !racl->groups.count) {
++	if (!racl->users.count && !racl->groups.count && racl->mask != NO_ENTRY) {
 +		/* Throw away a superfluous mask, but mask off the
 +		 * group perms with it first. */
 +		racl->group_obj &= racl->mask;
@@ -427,7 +424,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	return -1;
 +}
 +
-+/* Pack rsync acl -> system acl verbatim.  Return whether we succeeded. */
++/* Pack rsync ACL -> system ACL verbatim.  Return whether we succeeded. */
 +static BOOL pack_smb_acl(SMB_ACL_T *smb_acl, const rsync_acl *racl)
 +{
 +#ifdef ACLS_NEED_MASK
@@ -512,7 +509,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +		*match = racl_list->count - 1;
 +	while (count--) {
 +		rsync_acl *base = racl_list->items;
-+		if (rsync_acls_equal(base + *match, racl))
++		if (rsync_acl_equal(base + *match, racl))
 +			return *match;
 +		if (!(*match)--)
 +			*match = racl_list->count - 1;
@@ -522,42 +519,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	return *match;
 +}
 +
-+/* Turn the ACL data in statx into cached ACL data, setting the index
-+ * values in the file struct. */
-+void cache_acls(struct file_struct *file, statx *sxp)
-+{
-+	SMB_ACL_TYPE_T type;
-+	rsync_acl *racl;
-+	item_list *racl_list;
-+	char *ndx_ptr;
-+
-+	if (!sxp->acc_acl)
-+		return;
-+
-+	type = SMB_ACL_TYPE_ACCESS;
-+	racl = sxp->acc_acl;
-+	racl_list = &access_acl_list;
-+	ndx_ptr = (char*)file + file_struct_len;
-+	do {
-+		int ndx = find_matching_rsync_acl(type, racl_list, racl);
-+		if (ndx == -1) {
-+			acl_duo *new_duo;
-+			ndx = racl_list->count;
-+			new_duo = EXPAND_ITEM_LIST(racl_list, acl_duo, 1);
-+			new_duo->racl = *racl;
-+			new_duo->sacl = NULL;
-+			*racl = empty_rsync_acl;
-+		} else
-+			rsync_acl_free(racl);
-+		SIVAL(ndx_ptr, 0, ndx);
-+		racl = sxp->def_acl;
-+		racl_list = &default_acl_list;
-+		ndx_ptr += 4;
-+	} while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
-+}
-+
-+/* Return the ACL(s) for the given filename. */
-+int get_acls(const char *fname, statx *sxp)
++/* Return the Access Control List for the given filename. */
++int get_acl(const char *fname, statx *sxp)
 +{
 +	SMB_ACL_TYPE_T type;
 +
@@ -570,7 +533,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +		rsync_acl *racl = new(rsync_acl);
 +
 +		if (!racl)
-+			out_of_memory("get_acls");
++			out_of_memory("get_acl");
 +		if (type == SMB_ACL_TYPE_ACCESS)
 +			sxp->acc_acl = racl;
 +		else
@@ -581,7 +544,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +
 +			sys_acl_free_acl(sacl);
 +			if (!ok) {
-+				free_acls(sxp);
++				free_acl(sxp);
 +				return -1;
 +			}
 +		} else if (errno == ENOTSUP) {
@@ -590,9 +553,9 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +			if (type == SMB_ACL_TYPE_ACCESS)
 +				rsync_acl_fake_perms(racl, sxp->st.st_mode);
 +		} else {
-+			rsyserr(FERROR, errno, "get_acls: sys_acl_get_file(%s, %s)",
++			rsyserr(FERROR, errno, "get_acl: sys_acl_get_file(%s, %s)",
 +				fname, str_acl_type(type));
-+			free_acls(sxp);
++			free_acl(sxp);
 +			return -1;
 +		}
 +	} while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
@@ -604,7 +567,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +
 +/* The general strategy with the tag_type <-> character mapping is that
 + * lowercase implies that no qualifier follows, where uppercase does.
-+ * A similar idiom for the acl type (access or default) itself, but
++ * A similar idiom for the ACL type (access or default) itself, but
 + * lowercase in this instance means there's no ACL following, so the
 + * ACL is a repeat, so the receiver should reuse the last of the same
 + * type ACL. */
@@ -628,7 +591,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	}
 +}
 +
-+/* Send an rsync acl over the file descriptor. */
++/* Send an rsync ACL over the file descriptor. */
 +static void send_rsync_acl(int f, const rsync_acl *racl)
 +{
 +	size_t count = count_racl_entries(racl);
@@ -653,13 +616,14 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	}
 +}
 +
-+/* Send the ACLs from the statx structure down the indicated file descriptor.
++/* Send the ACL from the statx structure down the indicated file descriptor.
 + * This also frees the ACL data. */
-+void send_acls(statx *sxp, int f)
++void send_acl(statx *sxp, int f)
 +{
 +	SMB_ACL_TYPE_T type;
 +	rsync_acl *racl, *new_racl;
 +	item_list *racl_list;
++	int ndx;
 +
 +	if (S_ISLNK(sxp->st.st_mode))
 +		return;
@@ -668,11 +632,18 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	racl = sxp->acc_acl;
 +	racl_list = &access_acl_list;
 +	do {
-+		int ndx;
++		if (!racl) {
++			racl = new(rsync_acl);
++			if (!racl)
++				out_of_memory("send_acl");
++			*racl = empty_rsync_acl;
++			if (type == SMB_ACL_TYPE_ACCESS) {
++				rsync_acl_fake_perms(racl, sxp->st.st_mode);
++				sxp->acc_acl = racl;
++			} else
++				sxp->def_acl = racl;
++		}
 +
-+		/* Discard a superfluous mask. */
-+		if (racl->mask != NO_ENTRY && !racl->users.count && !racl->groups.count)
-+			racl->mask = NO_ENTRY;
 +		/* Avoid sending values that can be inferred from other data,
 +		 * but only when preserve_acls == 1 (it is 2 when we must be
 +		 * backward compatible with older acls.diff versions). */
@@ -681,9 +652,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +		if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) != -1) {
 +			write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'a' : 'd');
 +			write_int(f, ndx);
-+			rsync_acl_free(racl);
 +		} else {
-+			new_racl = EXPAND_ITEM_LIST(racl_list, rsync_acl, 1);
++			new_racl = EXPAND_ITEM_LIST(racl_list, rsync_acl, 1000);
 +			write_byte(f, type == SMB_ACL_TYPE_ACCESS ? 'A' : 'D');
 +			send_rsync_acl(f, racl);
 +			*new_racl = *racl;
@@ -693,7 +663,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +		racl_list = &default_acl_list;
 +	} while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
 +
-+	free_acls(sxp);
++	free_acl(sxp);
 +}
 +
 +/* === Receive functions === */
@@ -764,7 +734,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +				save_idas(&temp_ida_list, racl, prior_list_type);
 +			prior_list_type = tag_type;
 +		}
-+		ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, 0);
++		ida = EXPAND_ITEM_LIST(&temp_ida_list, id_access, -10);
 +		ida->access = access;
 +		ida->id = read_int(f);
 +		computed_mask_bits |= access;
@@ -794,7 +764,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +}
 +
 +/* Receive the ACL info the sender has included for this file-list entry. */
-+void receive_acls(struct file_struct *file, int f)
++void receive_acl(struct file_struct *file, int f)
 +{
 +	SMB_ACL_TYPE_T type;
 +	item_list *racl_list;
@@ -830,12 +800,12 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +		if (tag == 'A' || tag == 'D') {
 +			acl_duo *duo_item;
 +			ndx = racl_list->count;
-+			duo_item = EXPAND_ITEM_LIST(racl_list, acl_duo, 1);
++			duo_item = EXPAND_ITEM_LIST(racl_list, acl_duo, 1000);
 +			receive_rsync_acl(&duo_item->racl, f, type);
 +			duo_item->sacl = NULL;
 +		} else {
 +			ndx = read_int(f);
-+			if ((size_t)ndx >= racl_list->count) {
++			if (ndx < 0 || (size_t)ndx >= racl_list->count) {
 +				rprintf(FERROR, "receive_acl %s: %s ACL index %d out of range\n",
 +					f_name(file, NULL), str_acl_type(type), ndx);
 +				exit_cleanup(RERR_STREAMIO);
@@ -847,6 +817,43 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	} while (BUMP_TYPE(type) && S_ISDIR(file->mode));
 +}
 +
++/* Turn the ACL data in statx into cached ACL data, setting the index
++ * values in the file struct. */
++void cache_acl(struct file_struct *file, statx *sxp)
++{
++	SMB_ACL_TYPE_T type;
++	rsync_acl *racl;
++	item_list *racl_list;
++	char *ndx_ptr;
++	int ndx;
++
++	if (S_ISLNK(file->mode))
++		return;
++
++	type = SMB_ACL_TYPE_ACCESS;
++	racl = sxp->acc_acl;
++	racl_list = &access_acl_list;
++	ndx_ptr = (char*)file + file_struct_len;
++	do {
++		if (!racl)
++			ndx = -1;
++		else if ((ndx = find_matching_rsync_acl(type, racl_list, racl)) == -1) {
++			acl_duo *new_duo;
++			ndx = racl_list->count;
++			new_duo = EXPAND_ITEM_LIST(racl_list, acl_duo, 1000);
++			new_duo->racl = *racl;
++			new_duo->sacl = NULL;
++			*racl = empty_rsync_acl;
++		}
++		SIVAL(ndx_ptr, 0, ndx);
++		racl = sxp->def_acl;
++		racl_list = &default_acl_list;
++		ndx_ptr += 4;
++	} while (BUMP_TYPE(type) && S_ISDIR(sxp->st.st_mode));
++
++	free_acl(sxp);
++}
++
 +static mode_t change_sacl_perms(SMB_ACL_T sacl, rsync_acl *racl, mode_t old_mode, mode_t mode)
 +{
 +	SMB_ACL_ENTRY_T entry;
@@ -855,7 +862,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +
 +	if (S_ISDIR(mode)) {
 +		/* If the sticky bit is going on, it's not safe to allow all
-+		 * the new ACLs to go into effect before it gets set. */
++		 * the new ACL to go into effect before it gets set. */
 +#ifdef SMB_ACL_LOSES_SPECIAL_MODE_BITS
 +		if (mode & S_ISVTX)
 +			mode &= ~0077;
@@ -864,7 +871,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +			mode &= ~0077;
 +	} else {
 +		/* If setuid or setgid is going off, it's not safe to allow all
-+		 * the new ACLs to go into effect before they get cleared. */
++		 * the new ACL to go into effect before they get cleared. */
 +		if ((old_mode & S_ISUID && !(mode & S_ISUID))
 +		 || (old_mode & S_ISGID && !(mode & S_ISGID)))
 +			mode &= ~0077;
@@ -925,13 +932,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +
 +/* Set ACL on indicated filename.
 + *
-+ * This sets extended access ACL entries and default ACLs.  If convenient,
-+ * it sets permission bits along with the access ACLs and signals having
++ * This sets extended access ACL entries and default ACL.  If convenient,
++ * it sets permission bits along with the access ACL and signals having
 + * done so by modifying sxp->st.st_mode.
 + *
 + * Returns 1 for unchanged, 0 for changed, -1 for failed.  Call this
-+ * with fname set to NULL to just check if the ACLs are unchanged. */
-+int set_acls(const char *fname, const struct file_struct *file, statx *sxp)
++ * with fname set to NULL to just check if the ACL is unchanged. */
++int set_acl(const char *fname, const struct file_struct *file, statx *sxp)
 +{
 +	int unchanged = 1;
 +	SMB_ACL_TYPE_T type;
@@ -945,18 +952,24 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	do {
 +		acl_duo *duo_item;
 +		BOOL eq;
-+		int ndx = IVAL(ndx_ptr, 0);
++		int32 ndx = IVAL(ndx_ptr, 0);
 +
 +		ndx_ptr += 4;
 +
 +		if (type == SMB_ACL_TYPE_ACCESS) {
++			if (ndx < 0 || (size_t)ndx >= access_acl_list.count)
++				continue;
 +			duo_item = access_acl_list.items;
 +			duo_item += ndx;
-+			eq = rsync_acls_equal_enough(sxp->acc_acl, &duo_item->racl, file->mode);
++			eq = sxp->acc_acl
++			    && rsync_acl_equal_enough(sxp->acc_acl, &duo_item->racl, file->mode);
 +		} else {
++			if (ndx < 0 || (size_t)ndx >= default_acl_list.count)
++				continue;
 +			duo_item = default_acl_list.items;
 +			duo_item += ndx;
-+			eq = rsync_acls_equal(sxp->def_acl, &duo_item->racl);
++			eq = sxp->def_acl
++			    && rsync_acl_equal(sxp->def_acl, &duo_item->racl);
 +		}
 +		if (eq)
 +			continue;
@@ -1011,7 +1024,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +static int enum_ida_index = 0;
 +static size_t enum_racl_index = 0;
 +
-+/* This returns the next tag_type id from the given acl for the next entry,
++/* This returns the next tag_type id from the given ACL for the next entry,
 + * or it returns 0 if there are no more tag_type ids in the acl. */
 +static id_t *next_ace_id(SMB_ACL_TAG_T tag_type, const rsync_acl *racl)
 +{
@@ -1150,8 +1163,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +					continue;
 +#ifdef SUPPORT_ACLS
 +				if (preserve_acls) {
-+					get_acls(rel, &sx);
-+					cache_acls(file, &sx);
++					get_acl(rel, &sx);
++					cache_acl(file, &sx);
 +				}
 +#endif
 +				set_file_attrs(fullpath, file, NULL, 0);
@@ -1186,8 +1199,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
 +#ifdef SUPPORT_ACLS
 +	if (preserve_acls) {
-+		get_acls(fname, &sx);
-+		cache_acls(file, &sx);
++		get_acl(fname, &sx);
++		cache_acl(file, &sx);
 +	}
 +#endif
 +
@@ -1205,7 +1218,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			robust_unlink(fname); /* Just in case... */
 --- old/configure.in
 +++ new/configure.in
-@@ -482,6 +482,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
+@@ -515,6 +515,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
  fi
  
@@ -1217,7 +1230,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.
-@@ -746,6 +751,78 @@ AC_SUBST(OBJ_RESTORE)
+@@ -779,6 +784,78 @@ AC_SUBST(OBJ_RESTORE)
  AC_SUBST(CC_SHOBJ_FLAG)
  AC_SUBST(BUILD_POPT)
  
@@ -1310,12 +1323,12 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	permstring(permbuf, f->mode);
  
-+	/* TODO: indicate '+' if the entry has ACLs. */
++	/* TODO: indicate '+' if the entry has an ACL. */
 +
  #ifdef SUPPORT_LINKS
  	if (preserve_links && S_ISLNK(f->mode)) {
  		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-@@ -499,6 +502,9 @@ static struct file_struct *receive_file_
+@@ -491,6 +494,9 @@ static struct file_struct *receive_file_
  	char thisname[MAXPATHLEN];
  	unsigned int l1 = 0, l2 = 0;
  	int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
@@ -1325,14 +1338,14 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	OFF_T file_length;
  	char *basename, *dirname, *bp;
  	struct file_struct *file;
-@@ -602,13 +608,27 @@ static struct file_struct *receive_file_
+@@ -594,13 +600,27 @@ static struct file_struct *receive_file_
  
  	sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0;
  
 +#ifdef SUPPORT_ACLS
 +	/* We need one or two index int32s when we're preserving ACLs. */
 +	if (preserve_acls)
-+		xtra_len = (S_ISDIR(mode) ? 2 : 1) * sizeof (int32);
++		xtra_len = (S_ISDIR(mode) ? 2 : 1) * 4;
 +	else
 +		xtra_len = 0;
 +#endif
@@ -1353,60 +1366,19 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	file->modtime = modtime;
  	file->length = file_length;
-@@ -703,6 +723,11 @@ static struct file_struct *receive_file_
+@@ -695,6 +715,11 @@ static struct file_struct *receive_file_
  		read_buf(f, sum, checksum_len);
  	}
  
 +#ifdef SUPPORT_ACLS
 +	if (preserve_acls)
-+		receive_acls(file, f);
++		receive_acl(file, f);
 +#endif
 +
  	return file;
  }
  
-@@ -733,6 +758,9 @@ struct file_struct *make_file(char *fnam
- 	char thisname[MAXPATHLEN];
- 	char linkname[MAXPATHLEN];
- 	int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
-+#ifdef SUPPORT_ACLS
-+	int xtra_len;
-+#endif
- 	char *basename, *dirname, *bp;
- 
- 	if (!flist || !flist->count)	/* Ignore lastdir when invalid. */
-@@ -848,8 +876,19 @@ struct file_struct *make_file(char *fnam
- 	sum_len = always_checksum && am_sender && S_ISREG(st.st_mode)
- 	        ? MD4_SUM_LENGTH : 0;
- 
-+#ifdef SUPPORT_ACLS
-+	/* We need one or two index int32s when we're preserving ACLs. */
-+	if (preserve_acls)
-+		xtra_len = (S_ISDIR(st.st_mode) ? 2 : 1) * sizeof (int32);
-+	else
-+		xtra_len = 0;
-+#endif
-+
- 	alloc_len = file_struct_len + dirname_len + basename_len
--	    + linkname_len + sum_len;
-+#ifdef SUPPORT_ACLS
-+		  + xtra_len
-+#endif
-+		  + linkname_len + sum_len;
- 	if (flist)
- 		bp = pool_alloc(flist->file_pool, alloc_len, "make_file");
- 	else {
-@@ -860,6 +899,9 @@ struct file_struct *make_file(char *fnam
- 	file = (struct file_struct *)bp;
- 	memset(bp, 0, file_struct_len);
- 	bp += file_struct_len;
-+#ifdef SUPPORT_ACLS
-+	bp += xtra_len;
-+#endif
- 
- 	file->flags = flags;
- 	file->modtime = st.st_mtime;
-@@ -952,6 +994,9 @@ static struct file_struct *send_file_nam
+@@ -944,6 +969,9 @@ static struct file_struct *send_file_nam
  					  unsigned short flags)
  {
  	struct file_struct *file;
@@ -1416,7 +1388,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	file = make_file(fname, flist, stp, flags,
  			 f == -2 ? SERVER_FILTERS : ALL_FILTERS);
-@@ -961,6 +1006,15 @@ static struct file_struct *send_file_nam
+@@ -953,6 +981,15 @@ static struct file_struct *send_file_nam
  	if (chmod_modes && !S_ISLNK(file->mode))
  		file->mode = tweak_mode(file->mode, chmod_modes);
  
@@ -1424,7 +1396,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	if (preserve_acls) {
 +		sx.st.st_mode = file->mode;
 +		sx.acc_acl = sx.def_acl = NULL;
-+		if (get_acls(fname, &sx) < 0)
++		if (get_acl(fname, &sx) < 0)
 +			return NULL;
 +	}
 +#endif
@@ -1432,25 +1404,25 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	maybe_emit_filelist_progress(flist->count + flist_count_offset);
  
  	flist_expand(flist);
-@@ -968,6 +1022,15 @@ static struct file_struct *send_file_nam
+@@ -960,6 +997,15 @@ static struct file_struct *send_file_nam
  	if (file->basename[0]) {
  		flist->files[flist->count++] = file;
  		send_file_entry(file, f);
 +#ifdef SUPPORT_ACLS
 +		if (preserve_acls)
-+			send_acls(&sx, f);
++			send_acl(&sx, f);
 +#endif
 +	} else {
 +#ifdef SUPPORT_ACLS
 +		if (preserve_acls)
-+			free_acls(&sx);
++			free_acl(&sx);
 +#endif
  	}
  	return file;
  }
 --- old/generator.c
 +++ new/generator.c
-@@ -36,6 +36,7 @@ extern int recurse;
+@@ -35,6 +35,7 @@ extern int do_progress;
  extern int relative_paths;
  extern int implied_dirs;
  extern int keep_dirlinks;
@@ -1487,7 +1459,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		return 0;
  
 +#ifdef SUPPORT_ACLS
-+	if (preserve_acls && set_acls(NULL, file, sxp) == 0)
++	if (preserve_acls && set_acl(NULL, file, sxp) == 0)
 +		return 0;
 +#endif
 +
@@ -1522,13 +1494,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +		    && sxp->st.st_gid != file->gid)
  			iflags |= ITEM_REPORT_GROUP;
 +#ifdef SUPPORT_ACLS
-+		if (preserve_acls && set_acls(NULL, file, sxp) == 0)
++		if (preserve_acls && set_acl(NULL, file, sxp) == 0)
 +			iflags |= ITEM_REPORT_ACL;
 +#endif
  	} else
  		iflags |= ITEM_IS_NEW;
  
-@@ -603,7 +614,7 @@ void check_for_finished_hlinks(int itemi
+@@ -605,7 +616,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,
@@ -1537,7 +1509,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			 int maybe_ATTRS_REPORT, enum logcode code)
  {
  	int best_match = -1;
-@@ -612,7 +623,7 @@ static int try_dests_reg(struct file_str
+@@ -614,7 +625,7 @@ static int try_dests_reg(struct file_str
  
  	do {
  		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1546,7 +1518,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			continue;
  		switch (match_level) {
  		case 0:
-@@ -620,16 +631,20 @@ static int try_dests_reg(struct file_str
+@@ -622,16 +633,20 @@ static int try_dests_reg(struct file_str
  			match_level = 1;
  			/* FALL THROUGH */
  		case 1:
@@ -1560,17 +1532,17 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -			if (!unchanged_attrs(file, stp))
 +#ifdef SUPPORT_ACLS
 +			if (preserve_acls)
-+				get_acls(cmpbuf, sxp);
++				get_acl(cmpbuf, sxp);
 +#endif
 +			if (!unchanged_attrs(file, sxp))
  				continue;
- 			if ((always_checksum || ignore_times)
+ 			if (always_checksum && preserve_times
 -			 && cmp_time(stp->st_mtime, file->modtime))
 +			 && cmp_time(sxp->st.st_mtime, file->modtime))
  				continue;
  			best_match = j;
  			match_level = 3;
-@@ -644,22 +659,27 @@ static int try_dests_reg(struct file_str
+@@ -646,14 +661,14 @@ static int try_dests_reg(struct file_str
  	if (j != best_match) {
  		j = best_match;
  		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1579,30 +1551,31 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			match_level = 0;
  	}
  
- #ifdef HAVE_LINK
  	if (match_level == 3 && !copy_dest) {
+ #ifdef SUPPORT_HARD_LINKS
  		if (link_dest) {
 -			if (hard_link_one(file, ndx, fname, 0, stp,
 +			if (hard_link_one(file, ndx, fname, 0, sxp,
  					  cmpbuf, 1,
  					  itemizing && verbose > 1,
  					  code) < 0)
- 				goto try_a_copy;
- 			if (preserve_hard_links && file->link_u.links)
- 				hard_link_cluster(file, ndx, itemizing, code);
--		} else if (itemizing)
+@@ -665,8 +680,13 @@ static int try_dests_reg(struct file_str
+ 			}
+ 		} else
+ #endif
+-		if (itemizing)
 -			itemize(file, ndx, 0, stp, 0, 0, NULL);
-+		} else if (itemizing) {
++		if (itemizing) {
 +#ifdef SUPPORT_ACLS
 +			if (preserve_acls && !ACL_READY(*sxp))
-+				get_acls(fname, sxp);
++				get_acl(fname, sxp);
 +#endif
 +			itemize(file, ndx, 0, sxp, 0, 0, NULL);
 +		}
  		if (verbose > 1 && maybe_ATTRS_REPORT) {
- 			code = daemon_log_format_has_i || dry_run
- 			     ? FCLIENT : FINFO;
-@@ -678,8 +698,13 @@ static int try_dests_reg(struct file_str
+ 			rprintf(FCLIENT, "%s is uptodate\n", fname);
+ 		}
+@@ -682,8 +702,13 @@ static int try_dests_reg(struct file_str
  			}
  			return -1;
  		}
@@ -1611,14 +1584,14 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +		if (itemizing) {
 +#ifdef SUPPORT_ACLS
 +			if (preserve_acls && !ACL_READY(*sxp))
-+				get_acls(fname, sxp);
++				get_acl(fname, sxp);
 +#endif
 +			itemize(file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL);
 +		}
  		set_file_attrs(fname, file, NULL, 0);
  		if (maybe_ATTRS_REPORT
  		 && ((!itemizing && verbose && match_level == 2)
-@@ -704,13 +729,18 @@ static int try_dests_non(struct file_str
+@@ -707,13 +732,18 @@ static int try_dests_non(struct file_str
  			 enum logcode code)
  {
  	char fnamebuf[MAXPATHLEN];
@@ -1634,13 +1607,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +			continue;
 +#ifdef SUPPORT_ACLS
 +		if (preserve_acls)
-+			get_acls(fnamebuf, &sx);
++			get_acl(fnamebuf, &sx);
 +#endif
 +		if (!unchanged_attrs(file, &sx))
  			continue;
  		if (S_ISLNK(file->mode)) {
  #ifdef SUPPORT_LINKS
-@@ -723,10 +753,10 @@ static int try_dests_non(struct file_str
+@@ -726,10 +756,10 @@ static int try_dests_non(struct file_str
  #endif
  				continue;
  		} else if (IS_SPECIAL(file->mode)) {
@@ -1653,24 +1626,24 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				continue;
  		} else {
  			rprintf(FERROR,
-@@ -755,7 +785,15 @@ static int try_dests_non(struct file_str
+@@ -760,7 +790,15 @@ static int try_dests_non(struct file_str
  			int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
  				    + (link_dest ? ITEM_XNAME_FOLLOWS : 0);
  			char *lp = link_dest ? "" : NULL;
 -			itemize(file, ndx, 0, &st, changes, 0, lp);
 +#ifdef SUPPORT_ACLS
 +			if (preserve_acls)
-+				get_acls(fname, &sx);
++				get_acl(fname, &sx);
 +#endif
 +			itemize(file, ndx, 0, &sx, changes, 0, lp);
 +#ifdef SUPPORT_ACLS
 +			if (preserve_acls)
-+				free_acls(&sx);
++				free_acl(&sx);
 +#endif
  		}
  		if (verbose > 1 && maybe_ATTRS_REPORT) {
- 			code = daemon_log_format_has_i || dry_run
-@@ -769,6 +807,7 @@ static int try_dests_non(struct file_str
+ 			rprintf(FCLIENT, "%s is uptodate\n", fname);
+@@ -772,6 +810,7 @@ static int try_dests_non(struct file_str
  }
  
  static int phase = 0;
@@ -1678,7 +1651,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  /* Acts on the_file_list->file's ndx'th item, whose name is fname.  If a dir,
   * make sure it exists, and has the right permissions/timestamp info.  For
-@@ -790,7 +829,8 @@ static void recv_generator(char *fname, 
+@@ -793,7 +832,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;
@@ -1688,9 +1661,9 @@ 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;
-@@ -841,6 +881,9 @@ static void recv_generator(char *fname, 
- 		dry_run--;
- 		missing_below = -1;
+@@ -849,6 +889,9 @@ static void recv_generator(char *fname, 
+ 		} else if (!dry_run)
+ 			return;
  	}
 +#ifdef SUPPORT_ACLS
 +	sx.acc_acl = sx.def_acl = NULL;
@@ -1698,7 +1671,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	if (dry_run > 1) {
  		statret = -1;
  		stat_errno = ENOENT;
-@@ -848,7 +891,7 @@ static void recv_generator(char *fname, 
+@@ -856,7 +899,7 @@ static void recv_generator(char *fname, 
  		char *dn = file->dirname ? file->dirname : ".";
  		if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
  			if (relative_paths && !implied_dirs
@@ -1707,7 +1680,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",
-@@ -860,6 +903,10 @@ static void recv_generator(char *fname, 
+@@ -868,6 +911,10 @@ static void recv_generator(char *fname, 
  			}
  			if (fuzzy_basis)
  				need_fuzzy_dirlist = 1;
@@ -1718,7 +1691,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		}
  		parent_dirname = dn;
  
-@@ -868,7 +915,7 @@ static void recv_generator(char *fname, 
+@@ -876,7 +923,7 @@ static void recv_generator(char *fname, 
  			need_fuzzy_dirlist = 0;
  		}
  
@@ -1727,7 +1700,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				    keep_dirlinks && S_ISDIR(file->mode));
  		stat_errno = errno;
  	}
-@@ -886,8 +933,9 @@ static void recv_generator(char *fname, 
+@@ -894,8 +941,9 @@ static void recv_generator(char *fname, 
  	 * mode based on the local permissions and some heuristics. */
  	if (!preserve_perms) {
  		int exists = statret == 0
@@ -1739,7 +1712,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	}
  
  	if (S_ISDIR(file->mode)) {
-@@ -896,8 +944,8 @@ static void recv_generator(char *fname, 
+@@ -904,8 +952,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. */
@@ -1750,26 +1723,26 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				return;
  			statret = -1;
  		}
-@@ -906,7 +954,11 @@ static void recv_generator(char *fname, 
- 			dry_run++;
- 		}
- 		if (itemizing && f_out != -1) {
--			itemize(file, ndx, statret, &st,
+@@ -920,7 +968,11 @@ static void recv_generator(char *fname, 
+ 					sr = -1;
+ 				new_root_dir = 0;
+ 			}
+-			itemize(file, ndx, sr, &st,
 +#ifdef SUPPORT_ACLS
-+			if (preserve_acls && statret == 0)
-+				get_acls(fname, &sx);
++			if (preserve_acls && sr == 0)
++				get_acl(fname, &sx);
 +#endif
-+			itemize(file, ndx, statret, &sx,
- 				statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
++			itemize(file, ndx, sr, &sx,
+ 				sr ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
  		}
  		if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
-@@ -918,19 +970,19 @@ static void recv_generator(char *fname, 
- 					full_fname(fname));
+@@ -940,19 +992,19 @@ static void recv_generator(char *fname, 
+ 				return;
  			}
  		}
 -		if (set_file_attrs(fname, file, statret ? NULL : &st, 0)
 +		if (set_file_attrs(fname, file, statret ? NULL : &sx, 0)
- 		    && verbose && code && f_out != -1)
+ 		    && verbose && code != FNONE && f_out != -1)
  			rprintf(code, "%s/\n", fname);
  		if (delete_during && f_out != -1 && !phase && dry_run < 2
  		    && (file->flags & FLAG_DEL_HERE))
@@ -1788,7 +1761,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	if (preserve_links && S_ISLNK(file->mode)) {
  #ifdef SUPPORT_LINKS
-@@ -948,7 +1000,7 @@ static void recv_generator(char *fname, 
+@@ -970,7 +1022,7 @@ static void recv_generator(char *fname, 
  			char lnk[MAXPATHLEN];
  			int len;
  
@@ -1797,7 +1770,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			    && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) {
  				lnk[len] = 0;
  				/* A link already pointing to the
-@@ -956,10 +1008,10 @@ static void recv_generator(char *fname, 
+@@ -978,10 +1030,10 @@ static void recv_generator(char *fname, 
  				 * required. */
  				if (strcmp(lnk, file->u.link) == 0) {
  					if (itemizing) {
@@ -1810,7 +1783,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  						       maybe_ATTRS_REPORT);
  					if (preserve_hard_links
  					    && file->link_u.links) {
-@@ -972,9 +1024,9 @@ static void recv_generator(char *fname, 
+@@ -996,9 +1048,9 @@ static void recv_generator(char *fname, 
  			}
  			/* Not the right symlink (or not a symlink), so
  			 * delete it. */
@@ -1822,7 +1795,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				statret = -1;
  		} else if (basis_dir[0] != NULL) {
  			if (try_dests_non(file, fname, ndx, itemizing,
-@@ -990,7 +1042,7 @@ static void recv_generator(char *fname, 
+@@ -1015,7 +1067,7 @@ static void recv_generator(char *fname, 
  			}
  		}
  		if (preserve_hard_links && file->link_u.links
@@ -1831,7 +1804,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				       itemizing, code, HL_SKIP))
  			return;
  		if (do_symlink(file->u.link,fname) != 0) {
-@@ -999,7 +1051,7 @@ static void recv_generator(char *fname, 
+@@ -1024,7 +1076,7 @@ static void recv_generator(char *fname, 
  		} else {
  			set_file_attrs(fname, file, NULL, 0);
  			if (itemizing) {
@@ -1839,14 +1812,14 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +				itemize(file, ndx, statret, &sx,
  					ITEM_LOCAL_CHANGE, 0, NULL);
  			}
- 			if (code && verbose) {
-@@ -1033,18 +1085,22 @@ static void recv_generator(char *fname, 
- 				itemizing = code = 0;
+ 			if (code != FNONE && verbose) {
+@@ -1056,18 +1108,22 @@ static void recv_generator(char *fname, 
+ 				code = FNONE;
  			}
  		}
 +#ifdef SUPPORT_ACLS
 +		if (preserve_acls && statret == 0)
-+			get_acls(fname, &sx);
++			get_acl(fname, &sx);
 +#endif
  		if (statret != 0
 -		 || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
@@ -1871,7 +1844,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				statret = -1;
  			if (verbose > 2) {
  				rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-@@ -1057,7 +1113,7 @@ static void recv_generator(char *fname, 
+@@ -1080,7 +1136,7 @@ static void recv_generator(char *fname, 
  			} else {
  				set_file_attrs(fname, file, NULL, 0);
  				if (itemizing) {
@@ -1879,8 +1852,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +					itemize(file, ndx, statret, &sx,
  						ITEM_LOCAL_CHANGE, 0, NULL);
  				}
- 				if (code && verbose)
-@@ -1069,12 +1125,12 @@ static void recv_generator(char *fname, 
+ 				if (code != FNONE && verbose)
+@@ -1094,14 +1150,14 @@ static void recv_generator(char *fname, 
  			}
  		} else {
  			if (itemizing)
@@ -1890,13 +1863,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +			set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
  			if (preserve_hard_links && file->link_u.links)
  				hard_link_cluster(file, ndx, itemizing, code);
+ 			if (remove_source_files == 1)
+ 				goto return_with_success;
  		}
 -		return;
 +		goto cleanup;
  	}
  
  	if (!S_ISREG(file->mode)) {
-@@ -1108,7 +1164,7 @@ static void recv_generator(char *fname, 
+@@ -1135,7 +1191,7 @@ static void recv_generator(char *fname, 
  	}
  
  	if (update_only && statret == 0
@@ -1905,7 +1880,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		if (verbose > 1)
  			rprintf(FINFO, "%s is newer\n", fname);
  		return;
-@@ -1117,18 +1173,18 @@ static void recv_generator(char *fname, 
+@@ -1144,20 +1200,20 @@ static void recv_generator(char *fname, 
  	fnamecmp = fname;
  	fnamecmp_type = FNAMECMP_FNAME;
  
@@ -1922,13 +1897,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -		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);
- 		if (j == -2)
+ 		if (j == -2) {
+ 			if (remove_source_files == 1)
+ 				goto return_with_success;
 -			return;
 +			goto cleanup;
- 		if (j != -1) {
+ 		}
+ 		if (j >= 0) {
  			fnamecmp = fnamecmpbuf;
- 			fnamecmp_type = j;
-@@ -1137,7 +1193,7 @@ static void recv_generator(char *fname, 
+@@ -1167,7 +1223,7 @@ static void recv_generator(char *fname, 
  	}
  
  	real_ret = statret;
@@ -1937,7 +1914,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
-@@ -1156,7 +1212,7 @@ static void recv_generator(char *fname, 
+@@ -1186,7 +1242,7 @@ static void recv_generator(char *fname, 
  				rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
  					fname, fnamecmpbuf);
  			}
@@ -1946,7 +1923,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			statret = 0;
  			fnamecmp = fnamecmpbuf;
  			fnamecmp_type = FNAMECMP_FUZZY;
-@@ -1165,7 +1221,7 @@ static void recv_generator(char *fname, 
+@@ -1195,7 +1251,7 @@ static void recv_generator(char *fname, 
  
  	if (statret != 0) {
  		if (preserve_hard_links && file->link_u.links
@@ -1955,7 +1932,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				       itemizing, code, HL_SKIP))
  			return;
  		if (stat_errno == ENOENT)
-@@ -1175,31 +1231,44 @@ static void recv_generator(char *fname, 
+@@ -1205,39 +1261,52 @@ static void recv_generator(char *fname, 
  		return;
  	}
  
@@ -1977,7 +1954,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -			itemize(file, ndx, real_ret, &real_st,
 +#ifdef SUPPORT_ACLS
 +			if (preserve_acls && real_ret == 0)
-+				get_acls(fname, &real_sx);
++				get_acl(fname, &real_sx);
 +#endif
 +			itemize(file, ndx, real_ret, &real_sx,
  				0, 0, NULL);
@@ -1987,7 +1964,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +					sx.acc_acl = real_sx.acc_acl;
 +					sx.def_acl = real_sx.def_acl;
 +				} else
-+					free_acls(&real_sx);
++					free_acl(&real_sx);
 +			}
 +#endif
  		}
@@ -1995,6 +1972,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +		set_file_attrs(fname, file, &sx, maybe_ATTRS_REPORT);
  		if (preserve_hard_links && file->link_u.links)
  			hard_link_cluster(file, ndx, itemizing, code);
+ 		if (remove_source_files != 1)
+-			return;
++			goto cleanup;
+ 	  return_with_success:
+ 		if (!dry_run) {
+ 			char numbuf[4];
+ 			SIVAL(numbuf, 0, ndx);
+ 			send_msg(MSG_SUCCESS, numbuf, 4);
+ 		}
 -		return;
 +		goto cleanup;
  	}
@@ -2006,7 +1992,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		fnamecmp = partialptr;
  		fnamecmp_type = FNAMECMP_PARTIAL_DIR;
  		statret = 0;
-@@ -1223,17 +1292,21 @@ static void recv_generator(char *fname, 
+@@ -1261,17 +1330,21 @@ static void recv_generator(char *fname, 
  	  pretend_missing:
  		/* pretend the file didn't exist */
  		if (preserve_hard_links && file->link_u.links
@@ -2018,7 +2004,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		statret = real_ret = -1;
 +#ifdef SUPPORT_ACLS
 +		if (preserve_acls && ACL_READY(sx))
-+			free_acls(&sx);
++			free_acl(&sx);
 +#endif
  		goto notify_others;
  	}
@@ -2031,7 +2017,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);
-@@ -1244,7 +1317,7 @@ static void recv_generator(char *fname, 
+@@ -1282,7 +1355,7 @@ static void recv_generator(char *fname, 
  				full_fname(backupptr));
  			free(back_file);
  			close(fd);
@@ -2040,7 +2026,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) {
-@@ -1252,14 +1325,14 @@ static void recv_generator(char *fname, 
+@@ -1290,14 +1363,14 @@ static void recv_generator(char *fname, 
  				full_fname(backupptr));
  			free(back_file);
  			close(fd);
@@ -2057,20 +2043,20 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	}
  
  	if (verbose > 2)
-@@ -1277,24 +1350,32 @@ static void recv_generator(char *fname, 
+@@ -1315,24 +1388,32 @@ static void recv_generator(char *fname, 
  			iflags |= ITEM_BASIS_TYPE_FOLLOWS;
  		if (fnamecmp_type == FNAMECMP_FUZZY)
  			iflags |= ITEM_XNAME_FOLLOWS;
 -		itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
 +#ifdef SUPPORT_ACLS
 +		if (preserve_acls && real_ret == 0)
-+			get_acls(fname, &real_sx);
++			get_acl(fname, &real_sx);
 +#endif
 +		itemize(file, -1, real_ret, &real_sx, iflags, fnamecmp_type,
  			fuzzy_file ? fuzzy_file->basename : NULL);
 +#ifdef SUPPORT_ACLS
 +		if (preserve_acls)
-+			free_acls(&real_sx);
++			free_acl(&real_sx);
 +#endif
  	}
  
@@ -2095,7 +2081,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	if (f_copy >= 0) {
  		close(f_copy);
-@@ -1307,6 +1388,13 @@ static void recv_generator(char *fname, 
+@@ -1345,6 +1426,13 @@ static void recv_generator(char *fname, 
  	}
  
  	close(fd);
@@ -2103,13 +2089,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +  cleanup:
 +#ifdef SUPPORT_ACLS
 +	if (preserve_acls)
-+		free_acls(&sx);
++		free_acl(&sx);
 +#endif
 +	return;
  }
  
  void generate_files(int f_out, struct file_list *flist, char *local_name)
-@@ -1366,6 +1454,8 @@ void generate_files(int f_out, struct fi
+@@ -1404,6 +1492,8 @@ void generate_files(int f_out, struct fi
  	 * notice that and let us know via the redo pipe (or its closing). */
  	ignore_timeout = 1;
  
@@ -2120,15 +2106,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
 --- old/hlink.c
 +++ new/hlink.c
-@@ -25,6 +25,7 @@
- 
+@@ -26,6 +26,7 @@
  extern int verbose;
+ extern int do_xfers;
  extern int link_dest;
 +extern int preserve_acls;
  extern int make_backups;
- extern int log_format_has_i;
- extern char *basis_dir[];
-@@ -143,15 +144,19 @@ void init_hard_links(void)
+ extern int remove_source_files;
+ extern int stdout_format_has_i;
+@@ -145,15 +146,19 @@ void init_hard_links(void)
  
  #ifdef SUPPORT_HARD_LINKS
  static int maybe_hard_link(struct file_struct *file, int ndx,
@@ -2146,13 +2132,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -				itemize(file, ndx, statret, st,
 +#ifdef SUPPORT_ACLS
 +				if (preserve_acls && !ACL_READY(*sxp))
-+					get_acls(fname, sxp);
++					get_acl(fname, sxp);
 +#endif
 +				itemize(file, ndx, statret, sxp,
  					ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
  					0, "");
  			}
-@@ -166,13 +171,13 @@ static int maybe_hard_link(struct file_s
+@@ -168,13 +173,13 @@ static int maybe_hard_link(struct file_s
  			return -1;
  		}
  	}
@@ -2168,16 +2154,16 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		    enum logcode code, int skip)
  {
  #ifdef SUPPORT_HARD_LINKS
-@@ -207,7 +212,7 @@ int hard_link_check(struct file_struct *
+@@ -215,7 +220,7 @@ int hard_link_check(struct file_struct *
  						 || st2.st_ino != st3.st_ino)
  							continue;
  						statret = 1;
 -						st = &st3;
 +						sxp->st = st3;
- 						if (verbose < 2 || !log_format_has_i)
- 							itemizing = code = 0;
- 						break;
-@@ -215,12 +220,16 @@ int hard_link_check(struct file_struct *
+ 						if (verbose < 2 || !stdout_format_has_i) {
+ 							itemizing = 0;
+ 							code = FNONE;
+@@ -225,12 +230,16 @@ int hard_link_check(struct file_struct *
  					if (!unchanged_file(cmpbuf, file, &st3))
  						continue;
  					statret = 1;
@@ -2186,7 +2172,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +					sxp->st = st3;
 +#ifdef SUPPORT_ACLS
 +					if (preserve_acls)
-+						get_acls(cmpbuf, sxp);
++						get_acl(cmpbuf, sxp);
 +#endif
 +					if (unchanged_attrs(file, sxp))
  						break;
@@ -2195,9 +2181,9 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -			maybe_hard_link(file, ndx, fname, statret, st,
 +			maybe_hard_link(file, ndx, fname, statret, sxp,
  					toname, &st2, itemizing, code);
- 			file->F_HLINDEX = FINISHED_LINK;
- 		} else
-@@ -233,7 +242,7 @@ int hard_link_check(struct file_struct *
+ 			if (remove_source_files == 1 && do_xfers) {
+ 				char numbuf[4];
+@@ -248,7 +257,7 @@ int hard_link_check(struct file_struct *
  
  #ifdef SUPPORT_HARD_LINKS
  int hard_link_one(struct file_struct *file, int ndx, char *fname,
@@ -2206,20 +2192,20 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		  int itemizing, enum logcode code)
  {
  	if (do_link(toname, fname)) {
-@@ -249,7 +258,11 @@ int hard_link_one(struct file_struct *fi
+@@ -264,7 +273,11 @@ int hard_link_one(struct file_struct *fi
  	}
  
  	if (itemizing) {
 -		itemize(file, ndx, statret, st,
 +#ifdef SUPPORT_ACLS
 +		if (preserve_acls && statret == 0 && !ACL_READY(*sxp))
-+			get_acls(fname, sxp);
++			get_acl(fname, sxp);
 +#endif
 +		itemize(file, ndx, statret, sxp,
  			ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
  			terse ? "" : toname);
  	}
-@@ -266,11 +279,12 @@ void hard_link_cluster(struct file_struc
+@@ -281,11 +294,12 @@ void hard_link_cluster(struct file_struc
  #ifdef SUPPORT_HARD_LINKS
  	char hlink1[MAXPATHLEN];
  	char *hlink2;
@@ -2234,7 +2220,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		return;
  	if (!(file->flags & FLAG_HLINK_TOL)) {
  		while (!(file->flags & FLAG_HLINK_EOL)) {
-@@ -284,9 +298,13 @@ void hard_link_cluster(struct file_struc
+@@ -299,9 +313,13 @@ void hard_link_cluster(struct file_struc
  		if (file->F_HLINDEX != SKIPPED_LINK)
  			continue;
  		hlink2 = f_name(file, NULL);
@@ -2246,11 +2232,11 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +				hlink1, &st, itemizing, code);
 +#ifdef SUPPORT_ACLS
 +		if (preserve_acls)
-+			free_acls(&sx);
++			free_acl(&sx);
 +#endif
- 		file->F_HLINDEX = FINISHED_LINK;
- 	} while (!(file->flags & FLAG_HLINK_EOL));
- #endif
+ 		if (remove_source_files == 1 && do_xfers) {
+ 			char numbuf[4];
+ 			SIVAL(numbuf, 0, ndx);
 --- old/lib/sysacls.c
 +++ new/lib/sysacls.c
 @@ -0,0 +1,3240 @@
@@ -5496,7 +5482,12 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +}
 --- old/lib/sysacls.h
 +++ new/lib/sysacls.h
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,33 @@
++#if defined SUPPORT_ACLS && defined HAVE_SYS_ACL_H
++#include <sys/acl.h>
++#endif
++#include "smb_acls.h"
++
 +#define SMB_MALLOC(cnt) new_array(char, cnt)
 +#define SMB_MALLOC_P(obj) new_array(obj, 1)
 +#define SMB_MALLOC_ARRAY(obj, cnt) new_array(obj, cnt)
@@ -5527,7 +5518,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
 --- old/log.c
 +++ new/log.c
-@@ -603,8 +603,10 @@ static void log_formatted(enum logcode c
+@@ -615,8 +615,10 @@ static void log_formatted(enum logcode c
  			n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
  			n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
  			n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
@@ -5540,17 +5531,6 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  			if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
  				char ch = iflags & ITEM_IS_NEW ? '+' : '?';
---- old/mkproto.awk
-+++ new/mkproto.awk
-@@ -58,7 +58,7 @@ BEGIN {
-   next;
- }
- 
--!/^OFF_T|^size_t|^off_t|^pid_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^uchar|^short|^struct|^BOOL|^void|^time|^const|^RETSIGTYPE/ {
-+!/^OFF_T|^size_t|^off_t|^pid_t|^id_t|^unsigned|^mode_t|^DIR|^user|^int|^char|^uint|^uchar|^short|^struct|^BOOL|^void|^time|^const|^RETSIGTYPE/ {
-   next;
- }
- 
 --- old/options.c
 +++ new/options.c
 @@ -47,6 +47,7 @@ int copy_dirlinks = 0;
@@ -5561,7 +5541,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  int preserve_perms = 0;
  int preserve_executability = 0;
  int preserve_devices = 0;
-@@ -194,6 +195,7 @@ static void print_rsync_version(enum log
+@@ -198,6 +199,7 @@ static void print_rsync_version(enum log
  	char const *got_socketpair = "no ";
  	char const *have_inplace = "no ";
  	char const *hardlinks = "no ";
@@ -5569,7 +5549,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	char const *links = "no ";
  	char const *ipv6 = "no ";
  	STRUCT_STAT *dumstat;
-@@ -210,6 +212,10 @@ static void print_rsync_version(enum log
+@@ -214,6 +216,10 @@ static void print_rsync_version(enum log
  	hardlinks = "";
  #endif
  
@@ -5580,7 +5560,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  #ifdef SUPPORT_LINKS
  	links = "";
  #endif
-@@ -223,9 +229,9 @@ static void print_rsync_version(enum log
+@@ -227,9 +233,9 @@ static void print_rsync_version(enum log
  	rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
  	rprintf(f, "<http://rsync.samba.org/>\n");
  	rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
@@ -5592,17 +5572,26 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	/* Note that this field may not have type ino_t.  It depends
  	 * on the complicated interaction between largefile feature
-@@ -295,6 +301,9 @@ void usage(enum logcode F)
-   rprintf(F," -H, --hard-links            preserve hard links\n");
+@@ -282,7 +288,7 @@ void usage(enum logcode F)
+   rprintf(F," -v, --verbose               increase verbosity\n");
+   rprintf(F," -q, --quiet                 suppress non-error messages\n");
+   rprintf(F," -c, --checksum              skip based on checksum, not mod-time & size\n");
+-  rprintf(F," -a, --archive               archive mode; same as -rlptgoD (no -H)\n");
++  rprintf(F," -a, --archive               archive mode; same as -rlptgoD (no -H, -A)\n");
+   rprintf(F,"     --no-OPTION             turn off an implied OPTION (e.g. --no-D)\n");
+   rprintf(F," -r, --recursive             recurse into directories\n");
+   rprintf(F," -R, --relative              use relative path names\n");
+@@ -304,6 +310,9 @@ void usage(enum logcode F)
    rprintf(F," -p, --perms                 preserve permissions\n");
    rprintf(F," -E, --executability         preserve the file's executability\n");
+   rprintf(F,"     --chmod=CHMOD           affect file and/or directory permissions\n");
 +#ifdef SUPPORT_ACLS
 +  rprintf(F," -A, --acls                  preserve ACLs (implies --perms)\n");
 +#endif
-   rprintf(F,"     --chmod=CHMOD           change destination permissions\n");
    rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
    rprintf(F," -g, --group                 preserve group\n");
-@@ -410,6 +419,9 @@ static struct poptOption long_options[] 
+   rprintf(F,"     --devices               preserve device files (super-user only)\n");
+@@ -421,6 +430,9 @@ static struct poptOption long_options[] 
    {"no-perms",         0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
    {"no-p",             0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
    {"executability",   'E', POPT_ARG_NONE,   &preserve_executability, 0, 0, 0 },
@@ -5612,7 +5601,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 },
-@@ -1070,6 +1082,24 @@ int parse_arguments(int *argc, const cha
+@@ -1082,6 +1094,24 @@ int parse_arguments(int *argc, const cha
  			usage(FINFO);
  			exit_cleanup(0);
  
@@ -5637,7 +5626,7 @@ 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. */
-@@ -1504,6 +1534,10 @@ void server_options(char **args,int *arg
+@@ -1523,6 +1553,10 @@ void server_options(char **args,int *arg
  
  	if (preserve_hard_links)
  		argstr[x++] = 'H';
@@ -5650,17 +5639,17 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	if (preserve_gid)
 --- old/receiver.c
 +++ new/receiver.c
-@@ -48,6 +48,7 @@ extern int keep_partial;
+@@ -47,6 +47,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 *log_format;
+ extern char *stdout_format;
  extern char *tmpdir;
-@@ -346,6 +347,10 @@ int recv_files(int f_in, struct file_lis
- 	int itemizing = am_daemon ? daemon_log_format_has_i
- 		      : !am_server && log_format_has_i;
+@@ -350,6 +351,10 @@ int recv_files(int f_in, struct file_lis
+ 	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;
 +	int dflt_perms = (ACCESSPERMS & ~orig_umask);
 +#ifdef SUPPORT_ACLS
@@ -5669,7 +5658,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	int i, recv_ok;
  
  	if (verbose > 2)
-@@ -543,7 +548,16 @@ int recv_files(int f_in, struct file_lis
+@@ -553,7 +558,16 @@ int recv_files(int f_in, struct file_lis
  		 * mode based on the local permissions and some heuristics. */
  		if (!preserve_perms) {
  			int exists = fd1 != -1;
@@ -5686,36 +5675,38 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +					       dflt_perms, exists);
  		}
  
- 		/* We now check to see if we are writing file "inplace" */
+ 		/* We now check to see if we are writing the file "inplace" */
 --- old/rsync.c
 +++ new/rsync.c
-@@ -33,6 +33,7 @@
+@@ -32,6 +32,7 @@
+ 
  extern int verbose;
  extern int dry_run;
- extern int daemon_log_format_has_i;
 +extern int preserve_acls;
  extern int preserve_perms;
  extern int preserve_executability;
  extern int preserve_times;
-@@ -101,7 +102,8 @@ void free_sums(struct sum_struct *s)
+@@ -100,7 +101,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. */
--mode_t dest_mode(mode_t flist_mode, mode_t cur_mode, int exists)
-+mode_t dest_mode(mode_t flist_mode, mode_t cur_mode, int dflt_perms,
+-mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int exists)
++mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
 +		 int exists)
  {
+ 	int new_mode;
  	/* If the file already exists, we'll return the local permissions,
- 	 * possibly tweaked by the --executability option. */
-@@ -116,55 +118,63 @@ mode_t dest_mode(mode_t flist_mode, mode
- 				cur_mode |= (cur_mode & 0444) >> 2;
+@@ -117,56 +119,65 @@ mode_t dest_mode(mode_t flist_mode, mode
+ 				new_mode |= (new_mode & 0444) >> 2;
  		}
- 	} else
--		cur_mode = flist_mode & ACCESSPERMS & ~orig_umask;
-+		cur_mode = flist_mode & ACCESSPERMS & dflt_perms;
- 	if (daemon_chmod_modes && !S_ISLNK(flist_mode))
- 		cur_mode = tweak_mode(cur_mode, daemon_chmod_modes);
- 	return (flist_mode & ~CHMOD_BITS) | (cur_mode & CHMOD_BITS);
+ 	} else {
+-		/* Apply the umask and turn off special permissions. */
+-		new_mode = flist_mode & (~CHMOD_BITS | (ACCESSPERMS & ~orig_umask));
++		/* Apply destination default permissions and turn
++		 * off special permissions. */
++		new_mode = flist_mode & (~CHMOD_BITS | dflt_perms);
+ 	}
+ 	return new_mode;
  }
  
 -int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
@@ -5726,6 +5717,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -	STRUCT_STAT st2;
 +	statx sx2;
  	int change_uid, change_gid;
+ 	mode_t new_mode = file->mode;
  
 -	if (!st) {
 +	if (!sxp) {
@@ -5741,12 +5733,12 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +#ifdef SUPPORT_ACLS
 +		sx2.acc_acl = sx2.def_acl = NULL;
 +#endif
- 		if (!preserve_perms && S_ISDIR(file->mode)
+ 		if (!preserve_perms && S_ISDIR(new_mode)
 -		 && st->st_mode & S_ISGID) {
 +		 && sx2.st.st_mode & S_ISGID) {
  			/* We just created this directory and its setgid
  			 * bit is on, so make sure it stays on. */
- 			file->mode |= S_ISGID;
+ 			new_mode |= S_ISGID;
  		}
 +		sxp = &sx2;
  	}
@@ -5754,7 +5746,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -	if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
 +#ifdef SUPPORT_ACLS
 +	if (preserve_acls && !ACL_READY(*sxp))
-+		get_acls(fname, sxp);
++		get_acl(fname, sxp);
 +#endif
 +
 +	if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
@@ -5785,7 +5777,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		;
  	else
  #endif
-@@ -174,43 +184,55 @@ int set_file_attrs(char *fname, struct f
+@@ -176,45 +187,57 @@ int set_file_attrs(char *fname, struct f
  				rprintf(FINFO,
  					"set uid of %s from %ld to %ld\n",
  					fname,
@@ -5826,23 +5818,24 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		updated = 1;
  	}
  
+ 	if (daemon_chmod_modes && !S_ISLNK(new_mode))
+ 		new_mode = tweak_mode(new_mode, daemon_chmod_modes);
++
 +#ifdef SUPPORT_ACLS
-+	/* It's OK to call set_acls() now, even for a dir, as the generator
++	/* It's OK to call set_acl() now, even for a dir, as the generator
 +	 * will enable owner-writability using chmod, if necessary.
 +	 * 
-+	 * If set_acl changes permission bits in the process of setting
++	 * If set_acl() changes permission bits in the process of setting
 +	 * an access ACL, it changes sxp->st.st_mode so we know whether we
-+	 * need to chmod. */
-+	if (preserve_acls && set_acls(fname, file, sxp) == 0)
++	 * need to chmod(). */
++	if (preserve_acls && set_acl(fname, file, sxp) == 0)
 +		updated = 1;
 +#endif
 +
  #ifdef HAVE_CHMOD
--	if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
--		int ret = do_chmod(fname, file->mode);
-+	if ((sxp->st.st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
-+		mode_t mode = file->mode;
-+		int ret = do_chmod(fname, mode);
+-	if ((st->st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) {
++	if ((sxp->st.st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) {
+ 		int ret = do_chmod(fname, new_mode);
  		if (ret < 0) {
  			rsyserr(FERROR, errno,
  				"failed to set permissions on %s",
@@ -5852,21 +5845,21 @@ 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;
-@@ -225,6 +247,11 @@ int set_file_attrs(char *fname, struct f
+@@ -227,6 +250,11 @@ int set_file_attrs(char *fname, struct f
  		else
- 			rprintf(code, "%s is uptodate\n", fname);
+ 			rprintf(FCLIENT, "%s is uptodate\n", fname);
  	}
 +  cleanup:
 +#ifdef SUPPORT_ACLS
 +	if (preserve_acls && sxp == &sx2)
-+		free_acls(&sx2);
++		free_acl(&sx2);
 +#endif
  	return updated;
  }
  
 --- old/rsync.h
 +++ new/rsync.h
-@@ -485,6 +485,15 @@ struct idev {
+@@ -492,6 +492,15 @@ struct idev {
  #define IN_LOOPBACKNET 127
  #endif
  
@@ -5882,7 +5875,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  #define GID_NONE ((gid_t)-1)
  
  #define HL_CHECK_MASTER	0
-@@ -645,6 +654,17 @@ struct stats {
+@@ -653,6 +662,17 @@ struct stats {
  
  struct chmod_mode_struct;
  
@@ -5894,21 +5887,16 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +	size_t malloced;
 +} item_list;
 +
-+#define EXPAND_ITEM_LIST(lp, type, fast) \
-+	(type*)expand_item_list(lp, sizeof (type), #type, fast)
++#define EXPAND_ITEM_LIST(lp, type, incr) \
++	(type*)expand_item_list(lp, sizeof (type), #type, incr)
 +
  #include "byteorder.h"
  #include "lib/mdfour.h"
  #include "lib/wildmatch.h"
-@@ -660,6 +680,21 @@ struct chmod_mode_struct;
- 
+@@ -669,6 +689,16 @@ struct chmod_mode_struct;
  #define UNUSED(x) x __attribute__((__unused__))
+ #define NORETURN __attribute__((__noreturn__))
  
-+#if defined SUPPORT_ACLS && defined HAVE_SYS_ACL_H
-+#include <sys/acl.h>
-+#endif
-+#include "smb_acls.h"
-+
 +typedef struct {
 +    STRUCT_STAT st;
 +#ifdef SUPPORT_ACLS
@@ -5924,15 +5912,24 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  /* We have replacement versions of these if they're missing. */
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -321,6 +321,7 @@ to the detailed description below for a 
-  -H, --hard-links            preserve hard links
+@@ -300,7 +300,7 @@ to the detailed description below for a 
+  -v, --verbose               increase verbosity
+  -q, --quiet                 suppress non-error messages
+  -c, --checksum              skip based on checksum, not mod-time & size
+- -a, --archive               archive mode; same as -rlptgoD (no -H)
++ -a, --archive               archive mode; same as -rlptgoD (no -H, -A)
+      --no-OPTION             turn off an implied OPTION (e.g. --no-D)
+  -r, --recursive             recurse into directories
+  -R, --relative              use relative path names
+@@ -322,6 +322,7 @@ to the detailed description below for a 
   -p, --perms                 preserve permissions
   -E, --executability         preserve executability
+      --chmod=CHMOD           affect file and/or directory permissions
 + -A, --acls                  preserve ACLs (implies -p) [non-standard]
-      --chmod=CHMOD           change destination permissions
   -o, --owner                 preserve owner (super-user only)
   -g, --group                 preserve group
-@@ -742,7 +743,9 @@ quote(itemize(
+      --devices               preserve device files (super-user only)
+@@ -745,7 +746,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
@@ -5943,7 +5940,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.
  ))
-@@ -773,9 +776,11 @@ The preservation of the destination's se
+@@ -776,9 +779,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
@@ -5958,7 +5955,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
-@@ -793,6 +798,15 @@ quote(itemize(
+@@ -796,6 +801,15 @@ quote(itemization(
  
  If bf(--perms) is enabled, this option is ignored.
  
@@ -5974,7 +5971,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  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
-@@ -1372,8 +1386,8 @@ if the receiving rsync is at least versi
+@@ -1381,8 +1395,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).
  
@@ -5985,7 +5982,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.
-@@ -1422,7 +1436,11 @@ quote(itemize(
+@@ -1431,7 +1445,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).
@@ -6282,16 +6279,6 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +
 +#endif /* No ACLs. */
 +#endif /* _SMB_ACLS_H */
---- old/t_stub.c
-+++ new/t_stub.c
-@@ -78,3 +78,7 @@ struct filter_list_struct server_filter_
-     return NULL;
- }
- 
-+ const char *who_am_i(void)
-+{
-+    return "test";
-+}
 --- old/testsuite/acls.test
 +++ new/testsuite/acls.test
 @@ -0,0 +1,34 @@
@@ -6452,10 +6439,11 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
      sed -e '/block2\.5/d' \
 --- old/testsuite/itemize.test
 +++ new/testsuite/itemize.test
-@@ -29,14 +29,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/
+@@ -29,15 +29,15 @@ ln "$fromdir/foo/config1" "$fromdir/foo/
  $RSYNC -iplr "$fromdir/" "$todir/" \
      | tee "$outfile"
  cat <<EOT >"$chkfile"
+-cd+++++++ ./
 -cd+++++++ bar/
 -cd+++++++ bar/baz/
 ->f+++++++ bar/baz/rsync
@@ -6464,6 +6452,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 ->f+++++++ foo/config2
 ->f+++++++ foo/extra
 -cL+++++++ foo/sym -> ../bar/baz/rsync
++cd+++++++++ ./
 +cd+++++++++ bar/
 +cd+++++++++ bar/baz/
 +>f+++++++++ bar/baz/rsync
@@ -6475,7 +6464,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
  
-@@ -48,10 +48,10 @@ chmod 601 "$fromdir/foo/config2"
+@@ -49,10 +49,10 @@ chmod 601 "$fromdir/foo/config2"
  $RSYNC -iplrH "$fromdir/" "$todir/" \
      | tee "$outfile"
  cat <<EOT >"$chkfile"
@@ -6490,7 +6479,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
  
-@@ -68,11 +68,11 @@ chmod 777 "$todir/bar/baz/rsync"
+@@ -69,11 +69,11 @@ chmod 777 "$todir/bar/baz/rsync"
  $RSYNC -iplrtc "$fromdir/" "$todir/" \
      | tee "$outfile"
  cat <<EOT >"$chkfile"
@@ -6507,7 +6496,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
  
-@@ -97,15 +97,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
+@@ -98,15 +98,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
      | tee "$outfile"
  filter_outfile
  cat <<EOT >"$chkfile"
@@ -6532,7 +6521,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
  
-@@ -124,8 +124,8 @@ touch "$todir/foo/config2"
+@@ -125,8 +125,8 @@ touch "$todir/foo/config2"
  $RSYNC -iplrtH "$fromdir/" "$todir/" \
      | tee "$outfile"
  cat <<EOT >"$chkfile"
@@ -6543,11 +6532,11 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
  
-@@ -134,15 +134,15 @@ $RSYNC -ivvplrtH --copy-dest="$lddir" "$
+@@ -135,15 +135,15 @@ $RSYNC -ivvplrtH --copy-dest=../ld "$fro
      | tee "$outfile"
  filter_outfile
  cat <<EOT >"$chkfile"
--.d..t.... ./
+-cd+++++++ ./
 -cd+++++++ bar/
 -cd+++++++ bar/baz/
 -cf        bar/baz/rsync
@@ -6556,7 +6545,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -cf        foo/config2
 -hf        foo/extra => foo/config1
 -cL..T.... foo/sym -> ../bar/baz/rsync
-+.d..t...... ./
++cd+++++++++ ./
 +cd+++++++++ bar/
 +cd+++++++++ bar/baz/
 +cf          bar/baz/rsync
@@ -6568,16 +6557,16 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
  
-@@ -150,11 +150,11 @@ rm -rf "$todir"
- $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
+@@ -151,11 +151,11 @@ rm -rf "$todir"
+ $RSYNC -iplrtH --copy-dest=../ld "$fromdir/" "$todir/" \
      | tee "$outfile"
  cat <<EOT >"$chkfile"
--.d..t.... ./
+-cd+++++++ ./
 -cd+++++++ bar/
 -cd+++++++ bar/baz/
 -cd+++++++ foo/
 -hf        foo/extra => foo/config1
-+.d..t...... ./
++cd+++++++++ ./
 +cd+++++++++ bar/
 +cd+++++++++ bar/baz/
 +cd+++++++++ foo/
@@ -6585,11 +6574,11 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
  
-@@ -181,15 +181,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$
+@@ -182,15 +182,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$
      | tee "$outfile"
  filter_outfile
  cat <<EOT >"$chkfile"
--.d..t.... ./
+-cd+++++++ ./
 -cd+++++++ bar/
 -cd+++++++ bar/baz/
 -hf        bar/baz/rsync
@@ -6598,7 +6587,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -hf        foo/config2
 -hf        foo/extra => foo/config1
 -hL        foo/sym -> ../bar/baz/rsync
-+.d..t...... ./
++cd+++++++++ ./
 +cd+++++++++ bar/
 +cd+++++++++ bar/baz/
 +hf          bar/baz/rsync
@@ -6610,26 +6599,41 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
  
-@@ -197,10 +197,10 @@ rm -rf "$todir"
- $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
+@@ -198,10 +198,10 @@ rm -rf "$todir"
+ $RSYNC -iplrtH --dry-run --link-dest=../ld "$fromdir/" "$todir/" \
      | tee "$outfile"
  cat <<EOT >"$chkfile"
--.d..t.... ./
+-cd+++++++ ./
 -cd+++++++ bar/
 -cd+++++++ bar/baz/
 -cd+++++++ foo/
-+.d..t...... ./
++cd+++++++++ ./
 +cd+++++++++ bar/
 +cd+++++++++ bar/baz/
 +cd+++++++++ foo/
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
  
-@@ -228,14 +228,14 @@ filter_outfile
+@@ -209,10 +209,10 @@ rm -rf "$todir"
+ $RSYNC -iplrtH --link-dest=../ld "$fromdir/" "$todir/" \
+     | tee "$outfile"
+ cat <<EOT >"$chkfile"
+-cd+++++++ ./
+-cd+++++++ bar/
+-cd+++++++ bar/baz/
+-cd+++++++ foo/
++cd+++++++++ ./
++cd+++++++++ bar/
++cd+++++++++ bar/baz/
++cd+++++++++ foo/
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
+ 
+@@ -240,14 +240,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"
--.d..t.... ./
+-cd+++++++ ./
 -cd+++++++ bar/
 -cd+++++++ bar/baz/
 -.f        bar/baz/rsync
@@ -6637,7 +6641,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 -.f        foo/config1
 -.f        foo/config2
 -.L        foo/sym -> ../bar/baz/rsync
-+.d..t...... ./
++cd+++++++++ ./
 +cd+++++++++ bar/
 +cd+++++++++ bar/baz/
 +.f          bar/baz/rsync
@@ -6646,22 +6650,22 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +.f          foo/config2
 +.L          foo/sym -> ../bar/baz/rsync
  EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
  
-@@ -243,10 +243,10 @@ rm -rf "$todir"
+@@ -255,10 +255,10 @@ rm -rf "$todir"
  $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \
      | tee "$outfile"
  cat <<EOT >"$chkfile"
--.d..t.... ./
+-cd+++++++ ./
 -cd+++++++ bar/
 -cd+++++++ bar/baz/
 -cd+++++++ foo/
-+.d..t...... ./
++cd+++++++++ ./
 +cd+++++++++ bar/
 +cd+++++++++ bar/baz/
 +cd+++++++++ foo/
  EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed"
  
 --- old/uidlist.c
 +++ new/uidlist.c
@@ -6728,25 +6732,24 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		for (i = 0; i < flist->count; i++)
 --- old/util.c
 +++ new/util.c
-@@ -1446,3 +1446,32 @@ int bitbag_next_bit(struct bitbag *bb, i
+@@ -1468,3 +1468,31 @@ int bitbag_next_bit(struct bitbag *bb, i
  
  	return -1;
  }
 +
 +void *expand_item_list(item_list *lp, size_t item_size,
-+		       const char *desc, int fast)
++		       const char *desc, int incr)
 +{
 +	/* First time through, 0 <= 0, so list is expanded. */
 +	if (lp->malloced <= lp->count) {
 +		void *new_ptr;
 +		size_t new_size = lp->malloced;
-+		if (fast) {
-+			if (new_size < 1000)
-+				new_size += 1000;
-+			else
-+				new_size *= 2;
-+		} else
-+			new_size += 10;
++		if (incr < 0)
++			new_size -= incr; /* increase slowly */
++		else if (new_size < (size_t)incr)
++			new_size += incr;
++		else
++			new_size *= 2;
 +		new_ptr = realloc_array(lp->items, char, new_size * item_size);
 +		if (verbose >= 4) {
 +			rprintf(FINFO, "[%s] expand %s to %.0f bytes, did%s move\n",