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;
ret = start_inband_exchange(user, path, fd, fd, argc);
- return ret < 0? ret : client_run(fd, fd, -1, argc, argv);
+ return ret ? ret : client_run(fd, fd, -1, argc, argv);
}
int start_inband_exchange(char *user, char *path, int f_in, int f_out,
rprintf(FERROR, "%s\n", line);
/* This is always fatal; the server will now
* close the socket. */
- return RERR_STARTCLIENT;
- } else {
- rprintf(FINFO,"%s\n", line);
+ return -1;
}
+
+ rprintf(FINFO, "%s\n", line);
}
kluge_around_eof = 0;
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;
}
#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
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);