X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ad625644fe9ffc1900f67b5238dd7dabac07aa18..493b02f67f89aeb4deaf2c9a19aeaadd414071aa:/xattrs.diff

diff --git a/xattrs.diff b/xattrs.diff
index bb2c574..6f0c0c3 100644
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -320,8 +320,8 @@ After applying this patch, run these commands for a successful build:
  extern int preserve_perms;
  extern int preserve_executability;
  extern int preserve_times;
-@@ -225,6 +226,10 @@ int set_file_attrs(char *fname, struct f
- 	if (preserve_acls && set_acl(fname, file) == 0)
+@@ -211,6 +212,10 @@ int set_file_attrs(char *fname, struct f
+ 	if (preserve_acls && set_acl(fname, file, st->st_mode) == 0)
  		updated = 1;
  #endif
 +#ifdef SUPPORT_XATTRS
@@ -329,8 +329,8 @@ After applying this patch, run these commands for a successful build:
 +		updated = 1;
 +#endif
  
- 	if (verbose > 1 && flags & ATTRS_REPORT) {
- 		enum logcode code = daemon_log_format_has_i || dry_run
+ #ifdef HAVE_CHMOD
+ 	if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
 --- old/rsync.h
 +++ new/rsync.h
 @@ -672,6 +672,14 @@ struct chmod_mode_struct;