Relocated the setting of ic_ndx.
authorWayne Davison <wayned@samba.org>
Tue, 18 Sep 2007 01:14:33 +0000 (01:14 +0000)
committerWayne Davison <wayned@samba.org>
Tue, 18 Sep 2007 01:14:33 +0000 (01:14 +0000)
compat.c

index eaa7c55..3750ff9 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -119,10 +119,6 @@ void setup_protocol(int f_out,int f_in)
                acls_ndx = ++file_extra_cnt;
        if (preserve_xattrs)
                xattrs_ndx = ++file_extra_cnt;
-#ifdef ICONV_OPTION
-       if (iconv_opt && (!am_sender || inc_recurse))
-               ic_ndx = ++file_extra_cnt;
-#endif
 
        if (remote_protocol == 0) {
                if (am_server && !local_server)
@@ -230,6 +226,11 @@ void setup_protocol(int f_out,int f_in)
                need_messages_from_generator = 1;
        }
 
+#ifdef ICONV_OPTION
+       if (iconv_opt && (!am_sender || inc_recurse))
+               ic_ndx = ++file_extra_cnt;
+#endif
+
        if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
                int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY;
                if (!am_sender || protocol_version >= 30)