Fixed a build problem.

diff --git a/id-pair.diff b/id-pair.diff
index 32683b9..70bf5c8 100644 (file)
--- a/id-pair.diff
+++ b/id-pair.diff
@@ -146,6 +146,36 @@ gets to be really large.
                        iflags |= ITEM_REPORT_GROUP;
        } else
                iflags |= ITEM_IS_NEW;
+--- old/log.c
++++ new/log.c
+@@ -45,6 +45,7 @@ extern int preserve_times;
+ extern int log_format_has_i;
+ extern int log_format_has_o_or_i;
+ extern int daemon_log_format_has_o_or_i;
++extern struct id_pair *id_pairs;
+ extern char *auth_user;
+ extern char *log_format;
+ #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+@@ -480,16 +481,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;
 --- old/rsync.c
 +++ new/rsync.c
 @@ -50,6 +50,7 @@ extern int inplace;