From 4ade505c7ed255e2482b2a19bf40054c672d5b30 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sun, 20 May 2007 07:10:41 +0000
Subject: [PATCH] - Use F_OWNER() and F_GROUP() instead of F_UID() and F_GID().
 - Use the new FLAG_SKIP_GROUP define.

---
 generator.c | 10 +++++-----
 log.c       | 10 +++++-----
 rsync.c     | 20 +++++++++-----------
 3 files changed, 19 insertions(+), 21 deletions(-)

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)) {
diff --git a/log.c b/log.c
index c8763253..b837900c 100644
--- a/log.c
+++ b/log.c
@@ -481,18 +481,18 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
 			n = buf2;
 			break;
 		case 'U':
-			strlcat(fmt, "ld", sizeof fmt);
+			strlcat(fmt, "u", sizeof fmt);
 			snprintf(buf2, sizeof buf2, fmt,
-				 preserve_uid ? (long)F_UID(file) : 0);
+				 preserve_uid ? F_OWNER(file) : 0);
 			n = buf2;
 			break;
 		case 'G':
-			if (!preserve_gid || F_GID(file) == GID_NONE)
+			if (!preserve_gid || file->flags & FLAG_SKIP_GROUP)
 				n = "DEFAULT";
 			else {
-				strlcat(fmt, "ld", sizeof fmt);
+				strlcat(fmt, "u", sizeof fmt);
 				snprintf(buf2, sizeof buf2, fmt,
-					 (long)F_GID(file));
+					 F_GROUP(file));
 				n = buf2;
 			}
 			break;
diff --git a/rsync.c b/rsync.c
index e7dd4be1..935c5ddc 100644
--- a/rsync.c
+++ b/rsync.c
@@ -322,9 +322,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
 			updated = 1;
 	}
 
-	change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
-	change_gid = preserve_gid && F_GID(file) != GID_NONE
-		&& sxp->st.st_gid != F_GID(file);
+	change_uid = am_root && preserve_uid && sxp->st.st_uid != F_OWNER(file);
+	change_gid = preserve_gid && !(file->flags & FLAG_SKIP_GROUP)
+		  && sxp->st.st_gid != F_GROUP(file);
 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
 	if (S_ISLNK(sxp->st.st_mode))
 		;
@@ -334,22 +334,20 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
 		if (verbose > 2) {
 			if (change_uid) {
 				rprintf(FINFO,
-					"set uid of %s from %ld to %ld\n",
-					fname,
-					(long)sxp->st.st_uid, (long)F_UID(file));
+					"set uid of %s from %u to %u\n",
+					fname, (unsigned)sxp->st.st_uid, F_OWNER(file));
 			}
 			if (change_gid) {
 				rprintf(FINFO,
-					"set gid of %s from %ld to %ld\n",
-					fname,
-					(long)sxp->st.st_gid, (long)F_GID(file));
+					"set gid of %s from %u to %u\n",
+					fname, (unsigned)sxp->st.st_gid, F_GROUP(file));
 			}
 		}
 		if (am_root < 0) {
 			;
 		} else if (do_lchown(fname,
-		    change_uid ? F_UID(file) : sxp->st.st_uid,
-		    change_gid ? F_GID(file) : sxp->st.st_gid) != 0) {
+		    change_uid ? F_OWNER(file) : sxp->st.st_uid,
+		    change_gid ? F_GROUP(file) : sxp->st.st_gid) != 0) {
 			/* shouldn't have attempted to change uid or gid
 			 * unless have the privilege */
 			rsyserr(FERROR, errno, "%s %s failed",
-- 
2.34.1