From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Tue, 8 Feb 2011 21:32:31 +0000 (+0000)
Subject: prevent zone2sql and zone2ldap from importing the 'hints' zone into powerdns, which... 
X-Git-Tag: auth-3.0~249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc0fa09ed7e06b19410af5e84969a2101e27c9ee;p=pdns

prevent zone2sql and zone2ldap from importing the 'hints' zone into powerdns, which would give unexpected results.


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

diff --git a/pdns/backends/bind/zone2ldap.cc b/pdns/backends/bind/zone2ldap.cc
index 0ee9b699d..4fb208b50 100644
--- a/pdns/backends/bind/zone2ldap.cc
+++ b/pdns/backends/bind/zone2ldap.cc
@@ -194,6 +194,10 @@ int main( int argc, char* argv[] )
 
         		for( vector<BindDomainInfo>::const_iterator i = domains.begin(); i != domains.end(); i++ )
         		{
+					if(i->type!="master" && i->type!="slave") {
+						cerr<<" Warning! Skipping '"<<i->type<<"' zone '"<<i->name<<"'"<<endl;
+						continue;
+					}
         			try
         			{
         				if( i->name != "." && i->name != "localhost" && i->name != "0.0.127.in-addr.arpa" )
diff --git a/pdns/backends/bind/zone2sql.cc b/pdns/backends/bind/zone2sql.cc
index 8af1ffc8c..b6178933a 100644
--- a/pdns/backends/bind/zone2sql.cc
+++ b/pdns/backends/bind/zone2sql.cc
@@ -282,6 +282,10 @@ int main(int argc, char **argv)
           i!=domains.end();
           ++i)
         {
+		  if(i->type!="master" && i->type!="slave") {
+			cerr<<" Warning! Skipping '"<<i->type<<"' zone '"<<i->name<<"'"<<endl;
+			continue;
+          }
           try {
             if(mode==POSTGRES || mode==ORACLE) {
               if(g_intransaction && ::arg().mustDo("transactions")) {