Merge pull request #96 from webczat/termfork

Anope will now fork even when not started from a tty, like init scripts.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/init.cpp b/src/init.cpp
index 8f479f73e..e6bc8e150 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -440,7 +440,7 @@ void Anope::Init(int ac, char **av)
 	Log(LOG_TERMINAL) << "Using configuration file " << Anope::ConfigDir << "/" << ServicesConf.GetName();
 
 	/* Fork to background */
-	if (!Anope::NoFork && Anope::AtTerm())
+	if (!Anope::NoFork)
 	{
 		/* Install these before fork() - it is possible for the child to
 		 * connect and kill() the parent before it is able to install the
@@ -524,7 +524,7 @@ void Anope::Init(int ac, char **av)
 
 #ifndef _WIN32
 	/* We won't background later, so we should setuid now */
-	if (Anope::NoFork || !Anope::AtTerm())
+	if (Anope::NoFork)
 		setuidgid();
 #endif
 
diff --git a/src/servers.cpp b/src/servers.cpp
index 3427c2beb..6401d8d59 100644
--- a/src/servers.cpp
+++ b/src/servers.cpp
@@ -287,7 +287,7 @@ void Server::Sync(bool sync_links)
 
 		FOREACH_MOD(OnUplinkSync, (this));
 
-		if (!Anope::NoFork && Anope::AtTerm())
+		if (!Anope::NoFork)
 		{
 			Log(LOG_TERMINAL) << "Successfully linked, launching into background...";
 			Anope::Fork();