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().

Daemon: don't use daemon(), always require fork()
56c12bd1 · Max Kellermann · 3a6da7c5 · 56c12bd1 · 56c12bd1
Commit 56c12bd1 authored Jan 18, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 12 deletions

configure.ac configure.ac +0 -1

Daemon.cxx src/Daemon.cxx +0 -11

No files found.
--- 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])])

--- 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");
 }