- Call the new set_io_timeout() function to set the timeout value.

- If the user specified a shorter timeout than the config-file,
  don't override the shorter value.

diff --git a/clientserver.c b/clientserver.c
index 7c46c70..4f8c3e2 100644 (file)
--- 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;
@@ -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);