From 8b3e6fb98511b08673603893c13f4fa702f85153 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 20 Oct 2009 15:05:15 -0700
Subject: [PATCH] Make sure daemon's io_timeout is used as a maximum value.

---
 clientserver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clientserver.c b/clientserver.c
index 496a6ab4..f385e6ef 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -947,7 +947,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
-- 
2.34.1