X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/431efc89796646ebb049cf29e5545263114e0c5e..7c583c73160714a2f61034515adb1a4a32f9d818:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index e8dba431..1b3801bc 100644
--- 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);