X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/332cf6df7c32dbaa47cbfe515121da7bd53974e8..9742b386b3d5b3010675aef9febaffbf8ab2d2c0:/log.c

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;