From: Aki Tuomi <cmouse@cmouse.fi>
Date: Tue, 7 Jun 2016 19:36:40 +0000 (+0300)
Subject: recursor: Require = in forward-zones
X-Git-Tag: rec-3.7.4~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3958%2Fhead;p=thirdparty%2Fpdns.git

recursor: Require = in forward-zones
---

diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index 3dc5166822..036574c87d 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -320,9 +320,11 @@ SyncRes::domainmap_t* parseAuthAndForwards()
   const char *option_names[3]={"auth-zones", "forward-zones", "forward-zones-recurse"};
   for(int n=0; n < 3 ; ++n ) {
     parts.clear();
-    stringtok(parts, ::arg()[option_names[n]], ",\t\n\r");
+    stringtok(parts, ::arg()[option_names[n]], " ,\t\n\r");
     for(parts_t::const_iterator iter = parts.begin(); iter != parts.end(); ++iter) {
       SyncRes::AuthDomain ad;
+      if ((*iter).find('=') == string::npos)
+        throw PDNSException("Error parsing '" + *iter + "', missing =");
       pair<string,string> headers=splitField(*iter, '=');
       trim(headers.first);
       trim(headers.second);