From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 7 Nov 2017 08:21:30 +0000 (+0100)
Subject: use _exit() when we really really want to exit, for example after a fatal error.... 
X-Git-Tag: auth-4.1.0-rc3~20^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5bd2ea7bee2006a7a0719e916ffbd00894be2e5d;p=thirdparty%2Fpdns.git

use _exit() when we really really want to exit, for example after a fatal error. Stops is dying while we die.
---

diff --git a/pdns/communicator.cc b/pdns/communicator.cc
index 06b92d2b91..e73eecb8ff 100644
--- a/pdns/communicator.cc
+++ b/pdns/communicator.cc
@@ -66,7 +66,7 @@ void CommunicatorClass::loadArgsIntoSet(const char *listname, set<string> &lists
     }
     catch(PDNSException &e) {
       L<<Logger::Error<<"Unparseable IP in "<<listname<<". Error: "<<e.reason<<endl;
-      exit(1);
+      _exit(1);
     }
   }
 }
@@ -78,7 +78,7 @@ void CommunicatorClass::go()
   }
   catch(PDNSException &e) {
     L<<Logger::Error<<"Unparseable IP in allow-notify-from. Error: "<<e.reason<<endl;
-    exit(1);
+    _exit(1);
   }
 
   pthread_t tid;
@@ -93,7 +93,7 @@ void CommunicatorClass::go()
   }
   catch(PDNSException &e) {
     L<<Logger::Error<<"Unparseable IP in only-notify. Error: "<<e.reason<<endl;
-    exit(1);
+    _exit(1);
   }
 
   loadArgsIntoSet("also-notify", d_alsoNotify);
@@ -138,16 +138,16 @@ void CommunicatorClass::mainloop(void)
   catch(PDNSException &ae) {
     L<<Logger::Error<<"Exiting because communicator thread died with error: "<<ae.reason<<endl;
     Utility::sleep(1);
-    exit(1);
+    _exit(1);
   }
   catch(std::exception &e) {
     L<<Logger::Error<<"Exiting because communicator thread died with STL error: "<<e.what()<<endl;
-    exit(1);
+    _exit(1);
   }
   catch( ... )
   {
     L << Logger::Error << "Exiting because communicator caught unknown exception." << endl;
-    exit(1);
+    _exit(1);
   }
 }
 
diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc
index 95d24edcc8..bee70a86a0 100644
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@ -286,7 +286,7 @@ void DNSProxy::mainloop(void)
     L << Logger::Error << "Caught unknown exception." << endl;
   }
   L<<Logger::Error<<"Exiting because DNS proxy failed"<<endl;
-  exit(1);
+  _exit(1);
 }
 
 DNSProxy::~DNSProxy() {
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 2bb5785ebb..b5af6918ea 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -1233,7 +1233,7 @@ TCPNameserver::TCPNameserver()
     int tmp=1;
     if(setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char*)&tmp,sizeof tmp)<0) {
       L<<Logger::Error<<"Setsockopt failed"<<endl;
-      exit(1);  
+      _exit(1);  
     }
 
     if (::arg().asNum("tcp-fast-open") > 0) {
@@ -1285,7 +1285,7 @@ TCPNameserver::TCPNameserver()
     int tmp=1;
     if(setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char*)&tmp,sizeof tmp)<0) {
       L<<Logger::Error<<"Setsockopt failed"<<endl;
-      exit(1);  
+      _exit(1);  
     }
 
     if (::arg().asNum("tcp-fast-open") > 0) {
@@ -1354,7 +1354,7 @@ void TCPNameserver::thread()
             
             if(errno==EMFILE) {
               L<<Logger::Error<<"TCP handler out of filedescriptors, exiting, won't recover from this"<<endl;
-              exit(1);
+              _exit(1);
             }
           }
           else {
@@ -1393,7 +1393,7 @@ void TCPNameserver::thread()
   catch(...) {
     L<<Logger::Error<<"TCPNameserver dying because of an unexpected fatal error"<<endl;
   }
-  exit(1); // take rest of server with us
+  _exit(1); // take rest of server with us
 }
 
 
diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 7cfba4153b..f1a95f4e21 100644
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -382,5 +382,5 @@ void WebServer::go()
   catch(...) {
     L<<Logger::Error<<"Unknown exception in main webserver thread"<<endl;
   }
-  exit(1);
+  _exit(1);
 }
diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index d32bd6ced8..dc3265bf71 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -86,7 +86,7 @@ void AuthWebServer::statThread()
   }
   catch(...) {
     L<<Logger::Error<<"Webserver statThread caught an exception, dying"<<endl;
-    exit(1);
+    _exit(1);
   }
 }
 
@@ -1874,6 +1874,6 @@ void AuthWebServer::webThread()
   }
   catch(...) {
     L<<Logger::Error<<"AuthWebServer thread caught an exception, dying"<<endl;
-    exit(1);
+    _exit(1);
   }
 }