From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 16 Oct 2017 15:20:38 +0000 (+0200)
Subject: BIND: reject zones without 'file' stanza
X-Git-Tag: auth-4.0.5~1^2~10^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e36ed3267f6e3e2bf501ab28348cd7cea98801fd;p=thirdparty%2Fpdns.git

BIND: reject zones without 'file' stanza

Closes #5786

(cherry picked from commit 6808f3b5faf6ffc4bea8f78107be99766d2be75c)
---

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 3baf25ebb4..2ec75f2df8 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -806,6 +806,12 @@ void Bind2Backend::loadConfig(string* status)
         i!=domains.end();
         ++i) 
       {
+        if (!(i->hadFileDirective)) {
+          L<<Logger::Warning<<d_logprefix<<" Zone '"<<i->name<<"' has no 'file' directive set in "<<getArg("config")<<endl;
+          rejected++;
+          continue;
+        }
+
         if(i->type == "") {
           L<<Logger::Warning<<d_logprefix<<" Warning! Skipping zone '"<<i->name<<"' because it has no type specified"<<endl;
           rejected++;
diff --git a/pdns/bindparser.yy b/pdns/bindparser.yy
index d83190313f..9f3bf4b8c7 100644
--- a/pdns/bindparser.yy
+++ b/pdns/bindparser.yy
@@ -89,6 +89,8 @@ void BindParser::setVerbose(bool verbose)
 
 void BindParser::commit(BindDomainInfo DI)
 {
+  DI.hadFileDirective = (DI.filename != "");
+
   if(DI.filename[0]!='/')
     DI.filename=d_dir+"/"+DI.filename;
 
diff --git a/pdns/bindparserclasses.hh b/pdns/bindparserclasses.hh
index 4d71763803..b8a3caa231 100644
--- a/pdns/bindparserclasses.hh
+++ b/pdns/bindparserclasses.hh
@@ -51,6 +51,7 @@ public:
   vector<string> masters;
   set<string> alsoNotify;
   string type;
+  bool hadFileDirective;
     
   dev_t d_dev;
   ino_t d_ino;