From: Wayne Davison <wayned@samba.org>
Date: Sat, 15 Sep 2007 19:58:15 +0000 (+0000)
Subject: Handle inheritance of SGID bit on dirs marked with FLAG_DIR_CREATED.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/2dc7b91dd240db5de85d0f9e189d7293db19cae0

Handle inheritance of SGID bit on dirs marked with FLAG_DIR_CREATED.
---

diff --git a/rsync.c b/rsync.c
index 5d09fd3e..4f387d63 100644
--- a/rsync.c
+++ b/rsync.c
@@ -274,6 +274,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
 	statx sx2;
 	int change_uid, change_gid;
 	mode_t new_mode = file->mode;
+	int inherit;
 
 	if (!sxp) {
 		if (dry_run)
@@ -289,13 +290,15 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
 #ifdef SUPPORT_XATTRS
 		sx2.xattr = NULL;
 #endif
-		if (!preserve_perms && S_ISDIR(new_mode)
-		 && sx2.st.st_mode & S_ISGID) {
-			/* We just created this directory and its setgid
-			 * bit is on, so make sure it stays on. */
-			new_mode |= S_ISGID;
-		}
 		sxp = &sx2;
+		inherit = !preserve_perms;
+	} else
+		inherit = !preserve_perms && file->flags & FLAG_DIR_CREATED;
+
+	if (inherit && S_ISDIR(new_mode) && sxp->st.st_mode & S_ISGID) {
+		/* We just created this directory and its setgid
+		 * bit is on, so make sure it stays on. */
+		new_mode |= S_ISGID;
 	}
 
 #ifdef SUPPORT_ACLS