A slight simplification to the last change.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 8c42631..162ed8e 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -324,14 +324,12 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        if (lp_read_only(i))
                read_only = 1;
 
-       if (lp_transfer_logging(i)) {
+       if (lp_transfer_logging(i) && !logfile_format)
                logfile_format = lp_log_format(i);
-               if (log_format_has(logfile_format, 'i'))
-                       logfile_format_has_i = 1;
-               if (logfile_format_has_i
-                   || log_format_has(logfile_format, 'o'))
-                       logfile_format_has_o_or_i = 1;
-       }
+       if (log_format_has(logfile_format, 'i'))
+               logfile_format_has_i = 1;
+       if (logfile_format_has_i || log_format_has(logfile_format, 'o'))
+               logfile_format_has_o_or_i = 1;
 
        am_root = (MY_UID() == 0);
 
@@ -391,7 +389,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
                   XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
 
-       log_init();
+       log_init(1);
 
 #ifdef HAVE_PUTENV
        if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
@@ -838,7 +836,7 @@ int daemon_main(void)
        if (bind_address == NULL && *lp_bind_address())
                bind_address = lp_bind_address();
 
-       log_init();
+       log_init(0);
 
        rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n",
                RSYNC_VERSION, rsync_port);