diff options
| author | Wayne Davison <wayned@samba.org> | 2006-05-30 17:15:24 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2006-05-30 17:15:24 +0000 |
| commit | 10ae3406ee77bbb8c8d4c1212490f00e6376d08b (patch) | |
| tree | ae2efeb40394899a72a1f4ec65de988a09d085be /clientserver.c | |
| parent | 232658d9d383c6895dae982e99cf35ddd8f1d6cd (diff) | |
| download | android_external_rsync-10ae3406ee77bbb8c8d4c1212490f00e6376d08b.tar.gz android_external_rsync-10ae3406ee77bbb8c8d4c1212490f00e6376d08b.tar.bz2 android_external_rsync-10ae3406ee77bbb8c8d4c1212490f00e6376d08b.zip | |
Allow the --log-file-format=FMT option (if given when starting a daemon)
to override the "log format" setting.
Diffstat (limited to 'clientserver.c')
| -rw-r--r-- | clientserver.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/clientserver.c b/clientserver.c index 8c42631e..478e6cb9 100644 --- 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); |