A daemon no longer tries to refuse the iconv option when it is not enabled.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 2d5bd12..4ec0ac4 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -27,7 +27,6 @@ extern int dry_run;
 extern int do_xfers;
 extern int stdout_format_has_i;
 extern int logfile_format_has_i;
-extern int receiver_symlink_times;
 extern int am_root;
 extern int am_server;
 extern int am_daemon;
@@ -1857,7 +1856,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                rprintf(FINFO, "generating and sending sums for %d\n", ndx);
 
   notify_others:
-       if (remove_source_files && !delay_updates && !phase)
+       if (remove_source_files && !delay_updates && !phase && !dry_run)
                increment_active_files(ndx, itemizing, code);
        if (inc_recurse && !dry_run)
                cur_flist->in_progress++;
@@ -2081,7 +2080,7 @@ void generate_files(int f_out, const char *local_name)
        need_retouch_dir_times = preserve_times > 1;
        lull_mod = allowed_lull * 5;
        symlink_timeset_failed_flags = ITEM_REPORT_TIME
-                                    | (receiver_symlink_times ? ITEM_REPORT_TIMEFAIL : 0 );
+           | (protocol_version >= 30 || !am_server ? ITEM_REPORT_TIMEFAIL : 0);
 
        if (verbose > 2)
                rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());