From 3533c6f6240ef8f53990f341187b8493173bdd05 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 9 Mar 2006 19:50:49 +0000
Subject: [PATCH] Moved the set_acl() call after the do_chmod() call again.

---
 acls.diff | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/acls.diff b/acls.diff
index dd73b7b..5fe5dd8 100644
--- a/acls.diff
+++ b/acls.diff
@@ -4948,9 +4948,9 @@ ACLs to a non-ACL-supporting disk should complain.
  	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);
-@@ -203,6 +205,13 @@ int set_file_attrs(char *fname, struct f
- 		updated = 1;
+@@ -217,6 +219,13 @@ int set_file_attrs(char *fname, struct f
  	}
+ #endif
  
 +#ifdef SUPPORT_ACLS
 +	/* It's OK to call set_acl() now, even for a dir, as the generator
@@ -4959,9 +4959,9 @@ ACLs to a non-ACL-supporting disk should complain.
 +		updated = 1;
 +#endif
 +
- #ifdef HAVE_CHMOD
- 	if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
- 		int ret = do_chmod(fname, file->mode);
+ 	if (verbose > 1 && flags & ATTRS_REPORT) {
+ 		enum logcode code = daemon_log_format_has_i || dry_run
+ 				  ? FCLIENT : FINFO;
 --- old/rsync.h
 +++ new/rsync.h
 @@ -658,6 +658,20 @@ struct chmod_mode_struct;
-- 
2.34.1