From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 11 Oct 2012 08:30:56 +0000 (+0000)
Subject: make traceback handler optional, closes #497
X-Git-Tag: auth-3.2-rc1~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5488e86bd141d9c9b01d8687e90462b2f08cd7aa;p=thirdparty%2Fpdns.git

make traceback handler optional, closes #497

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2798 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 0f0dd0bac1..258e03eb01 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -136,6 +136,8 @@ void declareArguments()
   ::arg().set("entropy-source", "If set, read entropy from this file")="/dev/urandom";
 
   ::arg().set("lua-prequery-script", "Lua script with prequery handler")="";
+
+  ::arg().setSwitch("traceback-handler","Enable the traceback handler (Linux only)")="yes";
 }
 
 void declareStats(void)
diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index 873f6f7f37..c85c16d933 100644
--- a/pdns/pdns.conf-dist
+++ b/pdns/pdns.conf-dist
@@ -359,6 +359,11 @@
 #
 # tcp-control-secret=
 
+#################################
+# traceback-handler	Enable the traceback handler (Linux only)
+#
+# traceback-handler=yes
+
 #################################
 # trusted-notification-proxy	IP address of incoming notification proxy
 #
diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 96e714c1aa..d66a633b9a 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -466,7 +466,17 @@ int main(int argc, char **argv)
 
     
     // we really need to do work - either standalone or as an instance
-    
+
+#ifdef __linux__
+    if(!::arg().mustDo("traceback-handler")) {
+      L<<Logger::Warning<<"Disabling traceback handler"<<endl;
+      signal(SIGSEGV,SIG_DFL);
+      signal(SIGFPE,SIG_DFL);
+      signal(SIGABRT,SIG_DFL);
+      signal(SIGILL,SIG_DFL);
+    }
+#endif
+
     seedRandom(::arg()["entropy-source"]);
     
     loadModules();