From e281095a799ae15b64962a29bd7683ea9b77bc9b Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Thu, 26 Jul 2018 20:43:27 +0100
Subject: [PATCH] Close the fds after log initialisation.

---
 NXDNGateway/NXDNGateway.cpp     | 12 ++++++++----
 NXDNReflector/NXDNReflector.cpp | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/NXDNGateway/NXDNGateway.cpp b/NXDNGateway/NXDNGateway.cpp
index f96cba7..14a4f25 100644
--- a/NXDNGateway/NXDNGateway.cpp
+++ b/NXDNGateway/NXDNGateway.cpp
@@ -127,10 +127,6 @@ void CNXDNGateway::run()
 			return;
 		}
 
-		::close(STDIN_FILENO);
-		::close(STDOUT_FILENO);
-		::close(STDERR_FILENO);
-
 		// If we are currently root...
 		if (getuid() == 0) {
 			struct passwd* user = ::getpwnam("mmdvm");
@@ -168,6 +164,14 @@ void CNXDNGateway::run()
 		return;
 	}
 
+#if !defined(_WIN32) && !defined(_WIN64)
+	if (m_daemon) {
+		::close(STDIN_FILENO);
+		::close(STDOUT_FILENO);
+		::close(STDERR_FILENO);
+	}
+#endif
+
 	in_addr rptAddr = CUDPSocket::lookup(m_conf.getRptAddress());
 	unsigned int rptPort = m_conf.getRptPort();
 
diff --git a/NXDNReflector/NXDNReflector.cpp b/NXDNReflector/NXDNReflector.cpp
index 31ab8ec..0e078a2 100644
--- a/NXDNReflector/NXDNReflector.cpp
+++ b/NXDNReflector/NXDNReflector.cpp
@@ -120,10 +120,6 @@ void CNXDNReflector::run()
 			return;
 		}
 
-		::close(STDIN_FILENO);
-		::close(STDOUT_FILENO);
-		::close(STDERR_FILENO);
-
 		// If we are currently root...
 		if (getuid() == 0) {
 			struct passwd* user = ::getpwnam("mmdvm");
@@ -161,6 +157,14 @@ void CNXDNReflector::run()
 		return;
 	}
 
+#if !defined(_WIN32) && !defined(_WIN64)
+	if (m_daemon) {
+		::close(STDIN_FILENO);
+		::close(STDOUT_FILENO);
+		::close(STDERR_FILENO);
+	}
+#endif
+
 	unsigned short tg = m_conf.getTG();
 
 	CNXDNNetwork nxdnNetwork(m_conf.getNetworkPort(), m_conf.getNetworkDebug());