From 56c12bd1eae4318c1eae7cfed0196b886a35c918 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 18 Jan 2014 11:46:28 +0100
Subject: [PATCH] Daemon: don't use daemon(), always require fork()

Prepare for more advanced daemonization code, which will not work with
daemon().  Let's just require fork().  Everybody who supports daemon()
also supports fork().
---
 configure.ac   |  1 -
 src/Daemon.cxx | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 34fb4b1c1..71fdb0e1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,7 +153,6 @@ fi
 dnl ---------------------------------------------------------------------------
 dnl Header/Library Checks
 dnl ---------------------------------------------------------------------------
-AC_CHECK_FUNCS(daemon fork)
 
 AC_SEARCH_LIBS([syslog], [bsd socket inet],
 	[AC_DEFINE(HAVE_SYSLOG, 1, [Define if syslog() is available])])
diff --git a/src/Daemon.cxx b/src/Daemon.cxx
index b7c7554c1..2425e74c4 100644
--- a/src/Daemon.cxx
+++ b/src/Daemon.cxx
@@ -137,13 +137,6 @@ daemonize_detach(void)
 
 	fflush(nullptr);
 
-#ifdef HAVE_DAEMON
-
-	if (daemon(0, 1))
-		FatalSystemError("daemon() failed");
-
-#elif defined(HAVE_FORK)
-
 	/* detach from parent process */
 
 	switch (fork()) {
@@ -165,10 +158,6 @@ daemonize_detach(void)
 
 	setsid();
 
-#else
-	FatalError("no support for daemonizing");
-#endif
-
 	LogDebug(daemon_domain, "daemonized");
 }