From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 4 May 2016 16:57:12 +0000 (+0200)
Subject: bind: Improve skipped zone error messages, closes #3644
X-Git-Tag: rec-4.0.0-alpha3~6^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3816%2Fhead;p=thirdparty%2Fpdns.git

bind: Improve skipped zone error messages, closes #3644
---

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index a88e862014..79321e0c7a 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -795,8 +795,14 @@ void Bind2Backend::loadConfig(string* status)
         i!=domains.end();
         ++i) 
       {
+        if(i->type == "") {
+          L<<Logger::Warning<<d_logprefix<<" Warning! Skipping zone '"<<i->name<<"' because it has no type specified"<<endl;
+          rejected++;
+          continue;
+        }
         if(i->type!="master" && i->type!="slave") {
-          L<<Logger::Warning<<d_logprefix<<" Warning! Skipping '"<<i->type<<"' zone '"<<i->name<<"'"<<endl;
+          L<<Logger::Warning<<d_logprefix<<" Warning! Skipping zone '"<<i->name<<"' because type '"<<i->type<<"' is invalid"<<endl;
+          rejected++;
           continue;
         }