diff options
| author | Wayne Davison <wayned@samba.org> | 2005-02-19 22:16:35 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2005-02-19 22:16:35 +0000 |
| commit | f39b2060fe9ca6f1a9d271ed757669a8fde58e6c (patch) | |
| tree | a09629e77486c050f737f11f680b671725fd8044 /clientserver.c | |
| parent | 4f2ba7e0569b1d13177e51982253346dc46aad7b (diff) | |
| download | android_external_rsync-f39b2060fe9ca6f1a9d271ed757669a8fde58e6c.tar.gz android_external_rsync-f39b2060fe9ca6f1a9d271ed757669a8fde58e6c.tar.bz2 android_external_rsync-f39b2060fe9ca6f1a9d271ed757669a8fde58e6c.zip | |
We now set daemon_log_format_has_i and daemon_log_format_has_o_or_i
instead of itemize_daemon_changes.
Diffstat (limited to 'clientserver.c')
| -rw-r--r-- | clientserver.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/clientserver.c b/clientserver.c index 750068c8..fba0d212 100644 --- a/clientserver.c +++ b/clientserver.c @@ -52,7 +52,8 @@ extern char *files_from; char *auth_user; int read_only = 0; -int itemize_daemon_changes = 0; +int daemon_log_format_has_i = 0; +int daemon_log_format_has_o_or_i = 0; int module_id = -1; /* Length of lp_path() string when in daemon mode & not chrooted, else 0. */ @@ -284,8 +285,13 @@ static int rsync_module(int f_in, int f_out, int i) if (lp_read_only(i)) read_only = 1; - if (lp_transfer_logging(i) && strstr(lp_log_format(i), "%i") != NULL) - itemize_daemon_changes = 1; + if (lp_transfer_logging(i)) { + if (strstr(lp_log_format(i), "%i") != NULL) + daemon_log_format_has_i = 1; + if (daemon_log_format_has_i + || strstr(lp_log_format(i), "%o") != NULL) + daemon_log_format_has_o_or_i = 1; + } am_root = (MY_UID() == 0); |