aboutsummaryrefslogtreecommitdiffstats
path: root/clientserver.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-02-19 17:37:40 +0000
committerWayne Davison <wayned@samba.org>2005-02-19 17:37:40 +0000
commitc0814b813ff020d4a65b29696f240c9330bbde9d (patch)
tree9623ecf9f7ff6b5d840fbcdc3f4d6fcb1acc2468 /clientserver.c
parent088aff1a48b52821c19578bba0e3ead41fbe0ec5 (diff)
downloadandroid_external_rsync-c0814b813ff020d4a65b29696f240c9330bbde9d.tar.gz
android_external_rsync-c0814b813ff020d4a65b29696f240c9330bbde9d.tar.bz2
android_external_rsync-c0814b813ff020d4a65b29696f240c9330bbde9d.zip
If the "log format" has a %i in it, set itemize_daemon_changes.
Diffstat (limited to 'clientserver.c')
-rw-r--r--clientserver.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/clientserver.c b/clientserver.c
index 4cfda808..750068c8 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -27,15 +27,15 @@
#include "rsync.h"
+extern int verbose;
+extern int list_only;
extern int am_sender;
extern int am_server;
extern int am_daemon;
extern int am_root;
-extern int verbose;
extern int rsync_port;
extern int kludge_around_eof;
extern int daemon_over_rsh;
-extern int list_only;
extern int sanitize_paths;
extern int filesfrom_fd;
extern int remote_protocol;
@@ -52,6 +52,7 @@ extern char *files_from;
char *auth_user;
int read_only = 0;
+int itemize_daemon_changes = 0;
int module_id = -1;
/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
@@ -283,6 +284,9 @@ 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;
+
am_root = (MY_UID() == 0);
if (am_root) {