Note rsyncd-over-ssh and documentation TODOs.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index aefdb54..1b3801b 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -501,7 +501,8 @@ int daemon_main(void)
                return start_daemon(STDIN_FILENO);
        }
 
-       become_daemon();
+       if (!global_opts.no_detach)
+           become_daemon();
 
        if (!lp_load(config_file, 1)) {
                exit_cleanup(RERR_SYNTAX);
@@ -513,7 +514,8 @@ int daemon_main(void)
                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];