move the time init before the logfile opening.

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index e06617a..30aca47 100644 (file)
--- a/log.c
+++ b/log.c
@@ -69,6 +69,13 @@ void log_open(void)
        if (initialised) return;
        initialised = 1;
 
+       /* this looks pointless, but it is needed in order for the
+          C library on some systems to fetch the timezone info
+          before the chroot */
+       t = time(NULL);
+       localtime(&t);
+
+       /* optionally use a log file instead of syslog */
        logf = lp_log_file();
        if (logf && *logf) {
                logfile = fopen(logf, "a");
@@ -88,12 +95,6 @@ void log_open(void)
 #ifndef LOG_NDELAY
        logit(LOG_INFO,"rsyncd started\n");
 #endif
-
-       /* this looks pointless, but it is needed in order for the
-          C library on some systems to fetch the timezone info
-          before the chroot */
-       t = time(NULL);
-       localtime(&t);
 }
                
 
@@ -195,6 +196,7 @@ void rflush(int fd)
 static void log_formatted(char *op, struct file_struct *file)
 {
        extern int module_id;
+       extern char *auth_user;
        char buf[1024];
        char *p, *s, *n;
        char buf2[100];
@@ -222,6 +224,9 @@ static void log_formatted(char *op, struct file_struct *file)
                        break;
                case 'o': n = op; break;
                case 'f': n = f_name(file); break;
+               case 'm': n = lp_name(module_id); break;
+               case 'P': n = lp_path(module_id); break;
+               case 'u': n = auth_user; break;
                }
 
                if (!n) continue;