1 files changed, 18 insertions, 6 deletions
diff --git a/src/daemon.c b/src/daemon.c
index 5ae79e05..192fa8d3 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "daemon.h"
 
 #include <glib.h>
@@ -128,21 +129,28 @@ daemonize_set_user(void)
 static void
 daemonize_detach(void)
 {
-	pid_t pid;
-
 	/* flush all file handles before duplicating the buffers */
 
 	fflush(NULL);
 
+#ifdef HAVE_DAEMON
+
+	if (daemon(0, 1))
+		g_error("daemon() failed: %s", g_strerror(errno));
+
+#elif defined(HAVE_FORK)
+
 	/* detach from parent process */
 
-	pid = fork();
-	if (pid < 0)
+	switch (fork()) {
+	case -1:
 		g_error("fork() failed: %s", g_strerror(errno));
-
-	if (pid > 0)
+	case 0:
+		break;
+	default:
 		/* exit the parent process */
 		_exit(EXIT_SUCCESS);
+	}
 
 	/* release the current working directory */
 
@@ -153,6 +161,10 @@ daemonize_detach(void)
 
 	setsid();
 
+#else
+	g_error("no support for daemonizing");
+#endif
+
 	g_debug("daemonized!");
 }