Make sure daemon's io_timeout is used as a maximum value.

This commit is contained in:
Wayne Davison
2009-10-20 15:05:15 -07:00
parent 2455140b04
commit 855983b434

View File

@@ -856,7 +856,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
&& (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