From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 27 Aug 2015 15:12:23 +0000 (+0200)
Subject: since DNSName now accepts things w/o trialing . as domain names, suddenly dnsdist... 
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~62^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ad8b87a18cb166f3a2c33ada0159b5f201edeaf;p=thirdparty%2Fpdns.git

since DNSName now accepts things w/o trialing . as domain names, suddenly dnsdist parsed all netmasks as domain names. Now try mask first and if that fails, try domain name.
---

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index 48b17ffc22..937c6b2ebf 100644
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -41,9 +41,9 @@ std::shared_ptr<DNSRule> makeRule(const boost::variant<string,vector<pair<int, s
   
   auto add=[&](string src) {
     try {
-      smn.add(DNSName(src));
+      nmg.addMask(src); // need to try mask first, all masks are domain names!
     } catch(...) {
-      nmg.addMask(src);
+      smn.add(DNSName(src));
     }
   };
   if(auto src = boost::get<string>(&var))