X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ad54dcc827451383222d1cf12d33038ba7f49447..7aac6604c4642b93b619ac03c56e9877437bcce3:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index bf5a1334..ec74054f 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -479,7 +479,7 @@ static int rsync_module(int f_in, int f_out, int i)
 
 	if (lp_timeout(i)) {
 		io_timeout = lp_timeout(i);
-		if (io_timeout && io_timeout < select_timeout)
+		if (io_timeout < select_timeout)
 			select_timeout = io_timeout;
 	}
 
@@ -607,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();