Preparing for release of 3.0.0pre10

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 5baad1a..3619810 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -391,7 +391,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        pid_t pre_exec_pid = 0;
        char *request = NULL;
 
-#ifdef ICONV_CONST
+#ifdef ICONV_OPTION
        iconv_opt = lp_charset(i);
        if (*iconv_opt)
                setup_iconv();
@@ -480,9 +480,6 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        /* TODO: Perhaps take a list of gids, and make them into the
         * supplementary groups. */
 
-       /* We do a push_dir() without actually calling chdir() in order
-        * to make sure that the module's path is absolute.  After this
-        * check, module_dir will be set to an absolute path. */
        module_dir = lp_path(i);
        if (use_chroot) {
                if ((p = strstr(module_dir, "/./")) != NULL) {
@@ -492,6 +489,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                        out_of_memory("rsync_module");
        }
 
+       /* We do a push_dir() that doesn't actually call chdir()
+        * just to make a relative path absolute. */
        strlcpy(line, curr_dir, sizeof line);
        if (!push_dir(module_dir, 1))
                goto chdir_failed;
@@ -807,6 +806,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                exit_cleanup(RERR_UNSUPPORTED);
        }
 
+#ifdef ICONV_OPTION
        if (!iconv_opt) {
                if (ic_send != (iconv_t)-1) {
                        iconv_close(ic_send);
@@ -817,6 +817,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                        ic_recv = (iconv_t)-1;
                }
        }
+#endif
 
        if (!numeric_ids
         && (use_chroot ? lp_numeric_ids(i) != False : lp_numeric_ids(i) == True))