Tweaked a sentence.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 5286927..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;
@@ -268,11 +267,9 @@ static int rsync_module(int f_in, int f_out, int i)
                return -1;
        }
 
-       auth_user = auth_server(f_in, f_out, i, addr, "@RSYNCD: AUTHREQD ");
+       auth_user = auth_server(f_in, f_out, i, host, addr, "@RSYNCD: AUTHREQD ");
 
        if (!auth_user) {
-               rprintf(FLOG, "auth failed on module %s from %s (%s)\n",
-                       name, host, addr);
                io_printf(f_out, "@ERROR: auth failed on module %s\n", name);
                return -1;
        }
@@ -520,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);