From 23d15cf19794cfbdc8012b10df623b866adf4836 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 4 Jan 2016 11:43:06 +0100
Subject: [PATCH] Exit on backend instantiation failure

This also undoes a badly working change made in 74a04266.
---
 modules/bindbackend/bindbackend2.cc | 2 +-
 pdns/dnsbackend.cc                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 2ff20b895..f17135295 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -741,7 +741,7 @@ void Bind2Backend::loadConfig(string* status)
     }
     catch(PDNSException &ae) {
       L<<Logger::Error<<"Error parsing bind configuration: "<<ae.reason<<endl;
-      return;
+      throw;
     }
       
     vector<BindDomainInfo> domains=BP.getDomains();
diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc
index ed8a16dbb..e87e03107 100644
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@ -209,13 +209,13 @@ vector<DNSBackend *>BackendMakerClass::all(bool metadataOnly)
     L<<Logger::Error<<"Cleaning up"<<endl;
     for(vector<DNSBackend *>::const_iterator i=ret.begin();i!=ret.end();++i)
       delete *i;
-    throw;
+    exit(1);
   } catch(...) {
     // and cleanup
     L<<Logger::Error<<"Caught an exception instantiating a backend, cleaning up"<<endl;
     for(vector<DNSBackend *>::const_iterator i=ret.begin();i!=ret.end();++i)
       delete *i;
-    throw;
+    exit(1);
   }
 
   return ret;
-- 
2.40.0