Switch the checking of preserve_[ug]id var to checking [ug]id_ndx var

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index b837900..5290ec6 100644 (file)
--- a/log.c
+++ b/log.c
@@ -34,8 +34,8 @@ extern int msg_fd_out;
 extern int allow_8bit_chars;
 extern int protocol_version;
 extern int preserve_times;
-extern int preserve_uid;
-extern int preserve_gid;
+extern int uid_ndx;
+extern int gid_ndx;
 extern int stdout_format_has_i;
 extern int stdout_format_has_o_or_i;
 extern int logfile_format_has_i;
@@ -52,6 +52,7 @@ extern iconv_t ic_chck;
 extern iconv_t ic_send, ic_recv;
 #endif
 extern char curr_dir[];
+extern char *module_dir;
 extern unsigned int module_dirlen;
 
 static int log_initialised;
@@ -483,11 +484,11 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                case 'U':
                        strlcat(fmt, "u", sizeof fmt);
                        snprintf(buf2, sizeof buf2, fmt,
-                                preserve_uid ? F_OWNER(file) : 0);
+                                uid_ndx ? F_OWNER(file) : 0);
                        n = buf2;
                        break;
                case 'G':
-                       if (!preserve_gid || file->flags & FLAG_SKIP_GROUP)
+                       if (!gid_ndx || file->flags & FLAG_SKIP_GROUP)
                                n = "DEFAULT";
                        else {
                                strlcat(fmt, "u", sizeof fmt);
@@ -580,7 +581,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                        n = timestring(time(NULL));
                        break;
                case 'P':
-                       n = lp_path(module_id);
+                       n = module_dir;
                        break;
                case 'u':
                        n = auth_user;