X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/45c5b903eb96bc57ed1b4d59586defb1e4d0dc53..87a57a3072c0fe742b154bd62869cc08c65625bb:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 7c46c707..faf15936 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -41,7 +41,6 @@ extern int filesfrom_fd;
 extern int remote_protocol;
 extern int protocol_version;
 extern int io_timeout;
-extern int select_timeout;
 extern int orig_umask;
 extern int no_detach;
 extern int default_af_hint;
@@ -479,8 +478,8 @@ static int rsync_module(int f_in, int f_out, int i)
 
 #ifndef DEBUG
 	/* don't allow the logs to be flooded too fast */
-	if (verbose > lp_max_verbosity())
-		verbose = lp_max_verbosity();
+	if (verbose > lp_max_verbosity(i))
+		verbose = lp_max_verbosity(i);
 #endif
 
 	if (protocol_version < 23
@@ -518,11 +517,8 @@ static int rsync_module(int f_in, int f_out, int i)
 		exit_cleanup(RERR_UNSUPPORTED);
 	}
 
-	if (lp_timeout(i)) {
-		io_timeout = lp_timeout(i);
-		if (io_timeout < select_timeout)
-			select_timeout = io_timeout;
-	}
+	if (lp_timeout(i) && lp_timeout(i) > io_timeout)
+		set_io_timeout(lp_timeout(i));
 
 	start_server(f_in, f_out, argc, argp);