From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 30 Aug 2016 09:09:38 +0000 (+0200)
Subject: Parse query-local-address before lua-config-file
X-Git-Tag: rec-4.0.3~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b28e9947118424f17b72de7463f6f919a371d40e;p=thirdparty%2Fpdns.git

Parse query-local-address before lua-config-file

@42wim discovered that the query-local-address was not used for the
initial RPZ AXFR. However, it was used in subsequent IXFRs. It appears
that we executed the lua-config-file before checking the
query-local-address(6).

(cherry picked from commit b7ef582884c603ea45e602c3e42f254cf869d2d7)
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index ac31e08d81..d981d44d4f 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2576,6 +2576,32 @@ int serviceMain(int argc, char*argv[])
 
   g_disthashseed=dns_random(0xffffffff);
 
+  checkLinuxIPv6Limits();
+  try {
+    vector<string> addrs;
+    if(!::arg()["query-local-address6"].empty()) {
+      SyncRes::s_doIPv6=true;
+      L<<Logger::Warning<<"Enabling IPv6 transport for outgoing queries"<<endl;
+
+      stringtok(addrs, ::arg()["query-local-address6"], ", ;");
+      for(const string& addr : addrs) {
+        g_localQueryAddresses6.push_back(ComboAddress(addr));
+      }
+    }
+    else {
+      L<<Logger::Warning<<"NOT using IPv6 for outgoing queries - set 'query-local-address6=::' to enable"<<endl;
+    }
+    addrs.clear();
+    stringtok(addrs, ::arg()["query-local-address"], ", ;");
+    for(const string& addr : addrs) {
+      g_localQueryAddresses4.push_back(ComboAddress(addr));
+    }
+  }
+  catch(std::exception& e) {
+    L<<Logger::Error<<"Assigning local query addresses: "<<e.what();
+    exit(99);
+  }
+
   loadRecursorLuaConfig(::arg()["lua-config-file"]);
 
   parseACLs();
@@ -2637,32 +2663,6 @@ int serviceMain(int argc, char*argv[])
 
   SyncRes::s_minimumTTL = ::arg().asNum("minimum-ttl-override");
 
-  checkLinuxIPv6Limits();
-  try {
-    vector<string> addrs;
-    if(!::arg()["query-local-address6"].empty()) {
-      SyncRes::s_doIPv6=true;
-      L<<Logger::Warning<<"Enabling IPv6 transport for outgoing queries"<<endl;
-
-      stringtok(addrs, ::arg()["query-local-address6"], ", ;");
-      for(const string& addr : addrs) {
-        g_localQueryAddresses6.push_back(ComboAddress(addr));
-      }
-    }
-    else {
-      L<<Logger::Warning<<"NOT using IPv6 for outgoing queries - set 'query-local-address6=::' to enable"<<endl;
-    }
-    addrs.clear();
-    stringtok(addrs, ::arg()["query-local-address"], ", ;");
-    for(const string& addr : addrs) {
-      g_localQueryAddresses4.push_back(ComboAddress(addr));
-    }
-  }
-  catch(std::exception& e) {
-    L<<Logger::Error<<"Assigning local query addresses: "<<e.what();
-    exit(99);
-  }
-
   SyncRes::s_nopacketcache = ::arg().mustDo("disable-packetcache");
 
   SyncRes::s_maxnegttl=::arg().asNum("max-negative-ttl");