X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1564cd5a873fbb86e7a8230a4c09b20709a48723..4ade505c7ed255e2482b2a19bf40054c672d5b30:/generator.c

diff --git a/generator.c b/generator.c
index b64c0313..db1de189 100644
--- a/generator.c
+++ b/generator.c
@@ -521,10 +521,10 @@ int unchanged_attrs(const char *fname, struct file_struct *file, statx *sxp)
 	if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
 		return 0;
 
-	if (am_root && preserve_uid && sxp->st.st_uid != F_UID(file))
+	if (am_root && preserve_uid && sxp->st.st_uid != F_OWNER(file))
 		return 0;
 
-	if (preserve_gid && F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID(file))
+	if (preserve_gid && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != F_GROUP(file))
 		return 0;
 
 #ifdef SUPPORT_ACLS
@@ -565,10 +565,10 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
 			iflags |= ITEM_REPORT_TIME;
 		if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
 			iflags |= ITEM_REPORT_PERMS;
-		if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
+		if (preserve_uid && am_root && F_OWNER(file) != sxp->st.st_uid)
 			iflags |= ITEM_REPORT_OWNER;
-		if (preserve_gid && F_GID(file) != GID_NONE
-		    && sxp->st.st_gid != F_GID(file))
+		if (preserve_gid && !(file->flags & FLAG_SKIP_GROUP)
+		    && sxp->st.st_gid != F_GROUP(file))
 			iflags |= ITEM_REPORT_GROUP;
 #ifdef SUPPORT_ACLS
 		if (preserve_acls && !S_ISLNK(file->mode)) {