X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/49140b27c627e4fd13e3df510a9f7d8756ee3843..5e58e3f9cf3db5c3958fe6505eb59a2f814887fb:/generator.c

diff --git a/generator.c b/generator.c
index fb0bc2dd..0a63f00d 100644
--- a/generator.c
+++ b/generator.c
@@ -325,10 +325,10 @@ int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
 	 && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
 		return 0;
 
-	if (am_root && preserve_uid && st->st_uid != file->uid)
+	if (am_root && preserve_uid && st->st_uid != file->ids->uid)
 		return 0;
 
-	if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
+	if (preserve_gid && file->ids->gid != GID_NONE && st->st_gid != file->ids->gid)
 		return 0;
 
 	return 1;
@@ -351,10 +351,10 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 		if (preserve_perms
 		 && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
 			iflags |= ITEM_REPORT_PERMS;
-		if (preserve_uid && am_root && file->uid != st->st_uid)
+		if (preserve_uid && am_root && file->ids->uid != st->st_uid)
 			iflags |= ITEM_REPORT_OWNER;
-		if (preserve_gid && file->gid != GID_NONE
-		    && st->st_gid != file->gid)
+		if (preserve_gid && file->ids->gid != GID_NONE
+		    && st->st_gid != file->ids->gid)
 			iflags |= ITEM_REPORT_GROUP;
 	} else
 		iflags |= ITEM_IS_NEW;