From 94d3725cf202bbbef2674bb048d7604be7359303 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Mon, 20 Feb 2006 00:01:27 +0000
Subject: [PATCH] In dest_mode(), we now apply any "incoming chmod" changes
 from the daemon.

---
 rsync.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rsync.c b/rsync.c
index b03d2547..8ff841d0 100644
--- a/rsync.c
+++ b/rsync.c
@@ -50,6 +50,7 @@ extern int inplace;
 extern int keep_dirlinks;
 extern int make_backups;
 extern struct stats stats;
+extern struct chmod_mode_struct *daemon_chmod_modes;
 
 #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
 iconv_t ic_chck = (iconv_t)-1;
@@ -116,6 +117,8 @@ mode_t dest_mode(mode_t flist_mode, mode_t cur_mode, int exists)
 		}
 	} else
 		cur_mode = flist_mode & ACCESSPERMS & ~orig_umask;
+	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);
 }
 
-- 
2.34.1