Merge pull request #7757 from omoerbeek/rec-qname-min

[thirdparty/pdns.git] / pdns / bindparserclasses.hh

diff --git a/pdns/bindparserclasses.hh b/pdns/bindparserclasses.hh
index 2fd0790858b364096ef61b7fd9bb1b541e0e0286..12e60c227e82a6c1998930b6e8e93be9697e5b2b 100644 (file)
--- a/pdns/bindparserclasses.hh
+++ b/pdns/bindparserclasses.hh
@@ -1,24 +1,24 @@
 /*
-    PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002-2007  PowerDNS.COM BV
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2
-    as published by the Free Software Foundation
-
-    Additionally, the license of this program contains a special
-    exception which allows to distribute the program in binary form when
-    it is linked against OpenSSL.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ * This file is part of PowerDNS or dnsdist.
+ * Copyright -- PowerDNS.COM B.V. and its contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * In addition, for the avoidance of any doubt, permission is granted to
+ * link this program with OpenSSL and to (re)distribute the binaries
+ * produced as the result of such linking.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 #ifndef BINDPARSER_HH
 #define BINDPARSER_HH
 #include <string>
@@ -33,7 +33,7 @@
 class BindDomainInfo 
 {
 public:
-  BindDomainInfo() : d_dev(0), d_ino(0)
+  BindDomainInfo() : hadFileDirective(false), d_dev(0), d_ino(0)
   {}
 
   void clear() 
@@ -48,9 +48,10 @@ public:
   DNSName name;
   string viewName;
   string filename;
-  vector<string> masters;
+  vector<ComboAddress> masters;
   set<string> alsoNotify;
   string type;
+  bool hadFileDirective;
     
   dev_t d_dev;
   ino_t d_ino;