From ee39281d1425fef93d68b5e1411612b5bd9428eb Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 11 Mar 2008 14:50:21 -0700
Subject: [PATCH] Fixed the 'T' itemized output for a symlink the right way
 this time.

---
 generator.c | 3 +--
 rsync.c     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/generator.c b/generator.c
index 2d5bd128..b1634bd5 100644
--- 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;
@@ -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());
diff --git a/rsync.c b/rsync.c
index 827e8d89..302971fc 100644
--- a/rsync.c
+++ b/rsync.c
@@ -41,7 +41,6 @@ extern int am_generator;
 extern int am_starting_up;
 extern int allow_8bit_chars;
 extern int protocol_version;
-extern int receiver_symlink_times;
 extern int uid_ndx;
 extern int gid_ndx;
 extern int inc_recurse;
@@ -400,7 +399,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
 		}
 		if (ret == 0) /* ret == 1 if symlink could not be set */
 			updated = 1;
-		else if (receiver_symlink_times)
+		else
 			file->flags |= FLAG_TIME_FAILED;
 	}
 
-- 
2.34.1