+--- old/log.c
++++ new/log.c
+@@ -45,6 +45,7 @@ extern char *auth_user;
+ extern char *log_format;
+ extern char *logfile_format;
+ extern char *logfile_name;
++extern struct id_pair *id_pairs;
+ #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+ extern iconv_t ic_chck;
+ #endif
+@@ -464,16 +465,16 @@ static void log_formatted(enum logcode c
+ case 'U':
+ strlcat(fmt, "ld", sizeof fmt);
+ snprintf(buf2, sizeof buf2, fmt,
+- (long)file->uid);
++ (long)id_pairs[file->id_ndx].uid);
+ n = buf2;
+ break;
+ case 'G':
+- if (file->gid == GID_NONE)
++ if (id_pairs[file->id_ndx].gid == GID_NONE)
+ n = "DEFAULT";
+ else {
+ strlcat(fmt, "ld", sizeof fmt);
+ snprintf(buf2, sizeof buf2, fmt,
+- (long)file->gid);
++ (long)id_pairs[file->id_ndx].gid);
+ n = buf2;
+ }
+ break;