Save first filename and linenum in case exit_cleanup() recurses.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 496a6ab..fe7cff9 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -56,7 +56,6 @@ extern char *files_from;
 extern char *tmpdir;
 extern struct chmod_mode_struct *chmod_modes;
 extern filter_rule_list daemon_filter_list;
-extern char curr_dir[MAXPATHLEN];
 #ifdef ICONV_OPTION
 extern char *iconv_opt;
 extern iconv_t ic_send, ic_recv;
@@ -947,7 +946,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
         && (use_chroot ? lp_numeric_ids(i) != False : lp_numeric_ids(i) == True))
                numeric_ids = -1; /* Set --numeric-ids w/o breaking protocol. */
 
-       if (lp_timeout(i) && lp_timeout(i) > io_timeout)
+       if (lp_timeout(i) && (!io_timeout || lp_timeout(i) < io_timeout))
                set_io_timeout(lp_timeout(i));
 
        /* If we have some incoming/outgoing chmod changes, append them to