From: Wayne Davison <wayned@samba.org>
Date: Tue, 20 Oct 2009 22:05:15 +0000 (-0700)
Subject: Make sure daemon's io_timeout is used as a maximum value.
X-Git-Tag: v3.0.7pre1~19
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=855983b43405ee06c90a7603bdb7838ffeb75aa6;p=rsync.git

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

diff --git a/clientserver.c b/clientserver.c
index 18a22585..c8d2a0e7 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -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