X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/98e4de3da8554e90a2d409ce5b8f0a548d38912f..88f7513df3fca996d2669285ddb48a362a9a9825:/acls.diff

diff --git a/acls.diff b/acls.diff
index 64e83e5..d8b5419 100644
--- a/acls.diff
+++ b/acls.diff
@@ -1311,7 +1311,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
 --- old/flist.c
 +++ new/flist.c
-@@ -41,6 +41,7 @@ extern int curr_dir_depth;
+@@ -40,6 +40,7 @@ extern int filesfrom_fd;
  extern int one_file_system;
  extern int copy_dirlinks;
  extern int keep_dirlinks;
@@ -1319,7 +1319,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;
-@@ -134,6 +135,8 @@ static void list_file_entry(struct file_
+@@ -133,6 +134,8 @@ static void list_file_entry(struct file_
  
  	permstring(permbuf, f->mode);
  
@@ -1328,7 +1328,7 @@ 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",
-@@ -492,6 +495,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;
@@ -1338,7 +1338,7 @@ 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;
-@@ -595,13 +601,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;
  
@@ -1366,7 +1366,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	file->modtime = modtime;
  	file->length = file_length;
-@@ -694,6 +714,11 @@ static struct file_struct *receive_file_
+@@ -693,6 +713,11 @@ static struct file_struct *receive_file_
  		read_buf(f, sum, checksum_len);
  	}
  
@@ -1378,7 +1378,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	return file;
  }
  
-@@ -943,6 +968,9 @@ static struct file_struct *send_file_nam
+@@ -942,6 +967,9 @@ static struct file_struct *send_file_nam
  					  unsigned short flags)
  {
  	struct file_struct *file;
@@ -1388,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);
-@@ -952,6 +980,15 @@ static struct file_struct *send_file_nam
+@@ -951,6 +979,15 @@ static struct file_struct *send_file_nam
  	if (chmod_modes && !S_ISLNK(file->mode))
  		file->mode = tweak_mode(file->mode, chmod_modes);
  
@@ -1404,7 +1404,7 @@ 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);
-@@ -959,6 +996,15 @@ static struct file_struct *send_file_nam
+@@ -958,6 +995,15 @@ static struct file_struct *send_file_nam
  	if (file->basename[0]) {
  		flist->files[flist->count++] = file;
  		send_file_entry(file, f);
@@ -1509,7 +1509,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			 int maybe_ATTRS_REPORT, enum logcode code)
  {
  	int save_ignore_times = ignore_times;
-@@ -618,7 +629,7 @@ static int try_dests_reg(struct file_str
+@@ -617,7 +628,7 @@ static int try_dests_reg(struct file_str
  
  	do {
  		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1518,7 +1518,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			continue;
  		switch (match_level) {
  		case 0:
-@@ -626,16 +637,20 @@ static int try_dests_reg(struct file_str
+@@ -625,16 +636,20 @@ static int try_dests_reg(struct file_str
  			match_level = 1;
  			/* FALL THROUGH */
  		case 1:
@@ -1536,13 +1536,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +#endif
 +			if (!unchanged_attrs(file, sxp))
  				continue;
- 			if (always_checksum
+ 			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;
-@@ -653,14 +668,14 @@ static int try_dests_reg(struct file_str
+@@ -651,14 +666,14 @@ static int try_dests_reg(struct file_str
  	if (j != best_match) {
  		j = best_match;
  		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -1559,7 +1559,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  					  cmpbuf, 1,
  					  itemizing && verbose > 1,
  					  code) < 0)
-@@ -669,8 +684,13 @@ static int try_dests_reg(struct file_str
+@@ -667,8 +682,13 @@ static int try_dests_reg(struct file_str
  				hard_link_cluster(file, ndx, itemizing, code);
  		} else
  #endif
@@ -1573,9 +1573,9 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +			itemize(file, ndx, 0, sxp, 0, 0, NULL);
 +		}
  		if (verbose > 1 && maybe_ATTRS_REPORT) {
- 			code = daemon_log_format_has_i || dry_run
+ 			code = logfile_format_has_i || dry_run
  			     ? FCLIENT : FINFO;
-@@ -688,8 +708,13 @@ static int try_dests_reg(struct file_str
+@@ -686,8 +706,13 @@ static int try_dests_reg(struct file_str
  			}
  			return -1;
  		}
@@ -1591,7 +1591,7 @@ 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)
-@@ -714,13 +739,18 @@ static int try_dests_non(struct file_str
+@@ -712,13 +737,18 @@ static int try_dests_non(struct file_str
  			 enum logcode code)
  {
  	char fnamebuf[MAXPATHLEN];
@@ -1613,7 +1613,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			continue;
  		if (S_ISLNK(file->mode)) {
  #ifdef SUPPORT_LINKS
-@@ -733,10 +763,10 @@ static int try_dests_non(struct file_str
+@@ -731,10 +761,10 @@ static int try_dests_non(struct file_str
  #endif
  				continue;
  		} else if (IS_SPECIAL(file->mode)) {
@@ -1626,7 +1626,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				continue;
  		} else {
  			rprintf(FERROR,
-@@ -767,7 +797,15 @@ static int try_dests_non(struct file_str
+@@ -765,7 +795,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;
@@ -1642,8 +1642,8 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +#endif
  		}
  		if (verbose > 1 && maybe_ATTRS_REPORT) {
- 			code = daemon_log_format_has_i || dry_run
-@@ -781,6 +819,7 @@ static int try_dests_non(struct file_str
+ 			code = logfile_format_has_i || dry_run
+@@ -779,6 +817,7 @@ static int try_dests_non(struct file_str
  }
  
  static int phase = 0;
@@ -1651,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
-@@ -802,7 +841,8 @@ static void recv_generator(char *fname, 
+@@ -800,7 +839,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;
@@ -1661,7 +1661,7 @@ 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;
-@@ -853,6 +893,9 @@ static void recv_generator(char *fname, 
+@@ -851,6 +891,9 @@ static void recv_generator(char *fname, 
  		dry_run--;
  		missing_below = -1;
  	}
@@ -1671,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;
-@@ -860,7 +903,7 @@ static void recv_generator(char *fname, 
+@@ -858,7 +901,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
@@ -1680,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",
-@@ -872,6 +915,10 @@ static void recv_generator(char *fname, 
+@@ -870,6 +913,10 @@ static void recv_generator(char *fname, 
  			}
  			if (fuzzy_basis)
  				need_fuzzy_dirlist = 1;
@@ -1691,7 +1691,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		}
  		parent_dirname = dn;
  
-@@ -880,7 +927,7 @@ static void recv_generator(char *fname, 
+@@ -878,7 +925,7 @@ static void recv_generator(char *fname, 
  			need_fuzzy_dirlist = 0;
  		}
  
@@ -1700,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;
  	}
-@@ -898,8 +945,9 @@ static void recv_generator(char *fname, 
+@@ -896,8 +943,9 @@ static void recv_generator(char *fname, 
  	 * mode based on the local permissions and some heuristics. */
  	if (!preserve_perms) {
  		int exists = statret == 0
@@ -1712,7 +1712,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	}
  
  	if (S_ISDIR(file->mode)) {
-@@ -908,8 +956,8 @@ static void recv_generator(char *fname, 
+@@ -906,8 +954,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. */
@@ -1723,7 +1723,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				return;
  			statret = -1;
  		}
-@@ -918,7 +966,11 @@ static void recv_generator(char *fname, 
+@@ -916,7 +964,11 @@ static void recv_generator(char *fname, 
  			dry_run++;
  		}
  		if (itemizing && f_out != -1) {
@@ -1736,7 +1736,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
  		}
  		if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
-@@ -930,19 +982,19 @@ static void recv_generator(char *fname, 
+@@ -928,19 +980,19 @@ static void recv_generator(char *fname, 
  					full_fname(fname));
  			}
  		}
@@ -1761,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
-@@ -960,7 +1012,7 @@ static void recv_generator(char *fname, 
+@@ -958,7 +1010,7 @@ static void recv_generator(char *fname, 
  			char lnk[MAXPATHLEN];
  			int len;
  
@@ -1770,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
-@@ -968,10 +1020,10 @@ static void recv_generator(char *fname, 
+@@ -966,10 +1018,10 @@ static void recv_generator(char *fname, 
  				 * required. */
  				if (strcmp(lnk, file->u.link) == 0) {
  					if (itemizing) {
@@ -1783,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) {
-@@ -984,9 +1036,9 @@ static void recv_generator(char *fname, 
+@@ -982,9 +1034,9 @@ static void recv_generator(char *fname, 
  			}
  			/* Not the right symlink (or not a symlink), so
  			 * delete it. */
@@ -1795,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,
-@@ -1002,7 +1054,7 @@ static void recv_generator(char *fname, 
+@@ -1000,7 +1052,7 @@ static void recv_generator(char *fname, 
  			}
  		}
  		if (preserve_hard_links && file->link_u.links
@@ -1804,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) {
-@@ -1011,7 +1063,7 @@ static void recv_generator(char *fname, 
+@@ -1009,7 +1061,7 @@ static void recv_generator(char *fname, 
  		} else {
  			set_file_attrs(fname, file, NULL, 0);
  			if (itemizing) {
@@ -1813,7 +1813,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  					ITEM_LOCAL_CHANGE, 0, NULL);
  			}
  			if (code && verbose) {
-@@ -1045,18 +1097,22 @@ static void recv_generator(char *fname, 
+@@ -1043,18 +1095,22 @@ static void recv_generator(char *fname, 
  				itemizing = code = 0;
  			}
  		}
@@ -1844,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",
-@@ -1069,7 +1125,7 @@ static void recv_generator(char *fname, 
+@@ -1067,7 +1123,7 @@ static void recv_generator(char *fname, 
  			} else {
  				set_file_attrs(fname, file, NULL, 0);
  				if (itemizing) {
@@ -1853,7 +1853,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  						ITEM_LOCAL_CHANGE, 0, NULL);
  				}
  				if (code && verbose)
-@@ -1081,12 +1137,12 @@ static void recv_generator(char *fname, 
+@@ -1079,12 +1135,12 @@ static void recv_generator(char *fname, 
  			}
  		} else {
  			if (itemizing)
@@ -1869,7 +1869,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	}
  
  	if (!S_ISREG(file->mode)) {
-@@ -1120,7 +1176,7 @@ static void recv_generator(char *fname, 
+@@ -1118,7 +1174,7 @@ static void recv_generator(char *fname, 
  	}
  
  	if (update_only && statret == 0
@@ -1878,7 +1878,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;
-@@ -1129,18 +1185,18 @@ static void recv_generator(char *fname, 
+@@ -1127,18 +1183,18 @@ static void recv_generator(char *fname, 
  	fnamecmp = fname;
  	fnamecmp_type = FNAMECMP_FNAME;
  
@@ -1901,7 +1901,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		if (j != -1) {
  			fnamecmp = fnamecmpbuf;
  			fnamecmp_type = j;
-@@ -1149,7 +1205,7 @@ static void recv_generator(char *fname, 
+@@ -1147,7 +1203,7 @@ static void recv_generator(char *fname, 
  	}
  
  	real_ret = statret;
@@ -1910,7 +1910,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
-@@ -1168,7 +1224,7 @@ static void recv_generator(char *fname, 
+@@ -1166,7 +1222,7 @@ static void recv_generator(char *fname, 
  				rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
  					fname, fnamecmpbuf);
  			}
@@ -1919,7 +1919,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			statret = 0;
  			fnamecmp = fnamecmpbuf;
  			fnamecmp_type = FNAMECMP_FUZZY;
-@@ -1177,7 +1233,7 @@ static void recv_generator(char *fname, 
+@@ -1175,7 +1231,7 @@ static void recv_generator(char *fname, 
  
  	if (statret != 0) {
  		if (preserve_hard_links && file->link_u.links
@@ -1928,7 +1928,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  				       itemizing, code, HL_SKIP))
  			return;
  		if (stat_errno == ENOENT)
-@@ -1187,31 +1243,44 @@ static void recv_generator(char *fname, 
+@@ -1185,31 +1241,44 @@ static void recv_generator(char *fname, 
  		return;
  	}
  
@@ -1979,7 +1979,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  		fnamecmp = partialptr;
  		fnamecmp_type = FNAMECMP_PARTIAL_DIR;
  		statret = 0;
-@@ -1235,17 +1304,21 @@ static void recv_generator(char *fname, 
+@@ -1233,17 +1302,21 @@ static void recv_generator(char *fname, 
  	  pretend_missing:
  		/* pretend the file didn't exist */
  		if (preserve_hard_links && file->link_u.links
@@ -2004,7 +2004,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);
-@@ -1256,7 +1329,7 @@ static void recv_generator(char *fname, 
+@@ -1254,7 +1327,7 @@ static void recv_generator(char *fname, 
  				full_fname(backupptr));
  			free(back_file);
  			close(fd);
@@ -2013,7 +2013,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) {
-@@ -1264,14 +1337,14 @@ static void recv_generator(char *fname, 
+@@ -1262,14 +1335,14 @@ static void recv_generator(char *fname, 
  				full_fname(backupptr));
  			free(back_file);
  			close(fd);
@@ -2030,7 +2030,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  	}
  
  	if (verbose > 2)
-@@ -1289,24 +1362,32 @@ static void recv_generator(char *fname, 
+@@ -1287,24 +1360,32 @@ static void recv_generator(char *fname, 
  			iflags |= ITEM_BASIS_TYPE_FOLLOWS;
  		if (fnamecmp_type == FNAMECMP_FUZZY)
  			iflags |= ITEM_XNAME_FOLLOWS;
@@ -2068,7 +2068,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
  	if (f_copy >= 0) {
  		close(f_copy);
-@@ -1319,6 +1400,13 @@ static void recv_generator(char *fname, 
+@@ -1317,6 +1398,13 @@ static void recv_generator(char *fname, 
  	}
  
  	close(fd);
@@ -2082,7 +2082,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  }
  
  void generate_files(int f_out, struct file_list *flist, char *local_name)
-@@ -1378,6 +1466,8 @@ void generate_files(int f_out, struct fi
+@@ -1376,6 +1464,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;
  
@@ -5505,7 +5505,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
-@@ -600,8 +600,10 @@ static void log_formatted(enum logcode c
+@@ -592,8 +592,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';
@@ -5539,7 +5539,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 ";
@@ -5547,7 +5547,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
  
@@ -5558,7 +5558,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, "
@@ -5570,7 +5570,7 @@ 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)
+@@ -299,6 +305,9 @@ void usage(enum logcode F)
    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
    rprintf(F," -E, --executability         preserve the file's executability\n");
@@ -5580,7 +5580,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
    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[] 
+@@ -415,6 +424,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 },
@@ -5590,7 +5590,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 },
-@@ -1072,6 +1084,24 @@ int parse_arguments(int *argc, const cha
+@@ -1080,6 +1092,24 @@ int parse_arguments(int *argc, const cha
  			usage(FINFO);
  			exit_cleanup(0);
  
@@ -5615,7 +5615,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. */
-@@ -1503,6 +1533,10 @@ void server_options(char **args,int *arg
+@@ -1526,6 +1556,10 @@ void server_options(char **args,int *arg
  
  	if (preserve_hard_links)
  		argstr[x++] = 'H';
@@ -5628,7 +5628,7 @@ 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;
@@ -5636,9 +5636,9 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  extern struct stats stats;
  extern char *log_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;
+@@ -344,6 +345,10 @@ int recv_files(int f_in, struct file_lis
+ 	int save_make_backups = make_backups;
+ 	int itemizing = am_server ? logfile_format_has_i : log_format_has_i;
  	int max_phase = protocol_version >= 29 ? 2 : 1;
 +	int dflt_perms = (ACCESSPERMS & ~orig_umask);
 +#ifdef SUPPORT_ACLS
@@ -5647,7 +5647,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
+@@ -541,7 +546,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;
@@ -5670,7 +5670,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 @@ -33,6 +33,7 @@
  extern int verbose;
  extern int dry_run;
- extern int daemon_log_format_has_i;
+ extern int logfile_format_has_i;
 +extern int preserve_acls;
  extern int preserve_perms;
  extern int preserve_executability;
@@ -5844,7 +5844,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
 --- old/rsync.h
 +++ new/rsync.h
-@@ -485,6 +485,15 @@ struct idev {
+@@ -486,6 +486,15 @@ struct idev {
  #define IN_LOOPBACKNET 127
  #endif
  
@@ -5860,7 +5860,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 {
+@@ -646,6 +655,17 @@ struct stats {
  
  struct chmod_mode_struct;
  
@@ -5878,7 +5878,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"
-@@ -660,6 +680,16 @@ struct chmod_mode_struct;
+@@ -661,6 +681,16 @@ struct chmod_mode_struct;
  
  #define UNUSED(x) x __attribute__((__unused__))
  
@@ -5905,7 +5905,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
       --chmod=CHMOD           change destination permissions
   -o, --owner                 preserve owner (super-user only)
   -g, --group                 preserve group
-@@ -742,7 +743,9 @@ quote(itemize(
+@@ -744,7 +745,9 @@ quote(itemize(
    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
@@ -5916,7 +5916,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
+@@ -775,9 +778,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
@@ -5931,7 +5931,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(
+@@ -795,6 +800,15 @@ quote(itemize(
  
  If bf(--perms) is enabled, this option is ignored.
  
@@ -5947,7 +5947,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
-@@ -1374,8 +1388,8 @@ if the receiving rsync is at least versi
+@@ -1376,8 +1390,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).
  
@@ -5958,7 +5958,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.
-@@ -1424,7 +1438,11 @@ quote(itemize(
+@@ -1426,7 +1440,11 @@ quote(itemize(
    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).