From f0b4fdaf5e542135b6f1d5694550208cbd6fe9ec Mon Sep 17 00:00:00 2001
From: David Dykstra <dwd@samba.org>
Date: Tue, 21 Jan 2003 00:58:50 +0000
Subject: [PATCH] Ignore errors from chmod when --preserve-perms/-p/-a are not
 set. Gnu cp behaves the same way.

---
 NEWS      | 3 +++
 syscall.c | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index b7292e74..58a590c2 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,9 @@ rsync changes since last release
 
     * Set the default value of --modify-window to 2 on Cygwin.  (Max Bowsher)
 
+    * Ignore errors from chmod when -p/-a/--preserve-perms is not set.
+      (Dave Dykstra)
+
   BUG FIXES:
   
     * Fix "forward name lookup failed" errors on AIX 4.3.3.  (John
diff --git a/syscall.c b/syscall.c
index b198dbf4..58f1f677 100644
--- a/syscall.c
+++ b/syscall.c
@@ -29,6 +29,7 @@
 extern int dry_run;
 extern int read_only;
 extern int list_only;
+extern int preserve_perms;
 
 #define CHECK_RO if (read_only || list_only) {errno = EROFS; return -1;}
 
@@ -97,9 +98,13 @@ int do_open(char *pathname, int flags, mode_t mode)
 #if HAVE_CHMOD
 int do_chmod(const char *path, mode_t mode)
 {
+	int code;
 	if (dry_run) return 0;
 	CHECK_RO
-	return chmod(path, mode);
+	code = chmod(path, mode);
+	if ((code != 0) && preserve_perms)
+	    return code;
+	return 0;
 }
 #endif
 
@@ -150,7 +155,7 @@ int do_mkstemp(char *template, mode_t perms)
 	{
 		int fd = mkstemp(template);
 		if (fd == -1) return -1;
-		if (fchmod(fd, perms) != 0) {
+		if ((fchmod(fd, perms) != 0) && preserve_perms) {
 			close(fd);
 			unlink(template);
 			return -1;
-- 
2.34.1