if (!user) user = getenv("USER");
if (!user) user = getenv("LOGNAME");
- fd = open_socket_out_wrapped (host, rsync_port, bind_address);
+ fd = open_socket_out_wrapped (host, rsync_port, bind_address,
+ global_opts.af_hint);
if (fd == -1) {
exit_cleanup(RERR_SOCKETIO);
}
return start_daemon(STDIN_FILENO);
}
- become_daemon();
+ if (!global_opts.no_detach)
+ become_daemon();
if (!lp_load(config_file, 1)) {
exit_cleanup(RERR_SYNTAX);
log_init();
- rprintf(FINFO, "rsyncd version %s starting, listening on port %d\n", VERSION,
+ rprintf(FINFO, "rsyncd version %s starting, listening on port %d\n",
+ RSYNC_VERSION,
rsync_port);
/* TODO: If listening on a particular address, then show that
- * address too. */
+ * address too. In fact, why not just do inet_ntop on the
+ * local address??? */
if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
char pidbuf[16];