X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3add5835db9692bd6e527e625f7114ac8ed0bdef..54281fe73365df649520900e8562a286dd04a28d:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index c8ba5d8e..ec74054f 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -43,6 +43,7 @@ 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;
@@ -476,8 +477,11 @@ static int rsync_module(int f_in, int f_out, int i)
 		exit_cleanup(RERR_UNSUPPORTED);
 	}
 
-	if (lp_timeout(i))
+	if (lp_timeout(i)) {
 		io_timeout = lp_timeout(i);
+		if (io_timeout < select_timeout)
+			select_timeout = io_timeout;
+	}
 
 	start_server(f_in, f_out, argc, argp);
 
@@ -603,7 +607,7 @@ int daemon_main(void)
 
 	if (rsync_port == 0 && (rsync_port = lp_rsync_port()) == 0)
 		rsync_port = RSYNC_PORT;
-	if (bind_address == NULL)
+	if (bind_address == NULL && *lp_bind_address())
 		bind_address = lp_bind_address();
 
 	log_init();