Make symlink iconv work for a local copy.

Fixes issue mention in bug #5615.

diff --git a/NEWS b/NEWS
index 0b7c5d7..d2acdbd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,8 @@ Changes since 3.0.5:
     - Fixed a problem where a vanished directory could turn into an exit code
       23 instead of the proper exit code 24.
 
+    - Fixed the --iconv conversion of symlinks when doing a local copy.
+
     - Fixed configure's erroneous use of target.
 
     - Fixed configure's --disable-debug option.

diff --git a/compat.c b/compat.c
index ae3268a..b921d4e 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -271,7 +271,7 @@ void setup_protocol(int f_out,int f_in)
 #endif
 #ifdef ICONV_OPTION
                sender_symlink_iconv = iconv_opt && (am_server
-                   ? strchr(client_info, 's') != NULL
+                   ? local_server || strchr(client_info, 's') != NULL
                    : !!(compat_flags & CF_SYMLINK_ICONV));
 #endif
                if (inc_recurse && !allow_inc_recurse) {