From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 10 Jun 2020 12:26:55 +0000 (+0200)
Subject: rec: Clean up QLA
X-Git-Tag: rec-4.4.0-beta1~56^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=094ab9a345748f0e465a0431fc3a01bec8f1806d;p=thirdparty%2Fpdns.git

rec: Clean up QLA
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 551db20b76..71ea44bb06 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4166,7 +4166,7 @@ static int serviceMain(int argc, char*argv[])
     g_log<<Logger::Warning<<"Enabling IPv4 transport for outgoing queries"<<endl;
   }
   else {
-    g_log<<Logger::Warning<<"NOT using IPv6 for outgoing queries - add an IPv4 address (like '0.0.0.0') to query-local-address to enable"<<endl;
+    g_log<<Logger::Warning<<"NOT using IPv4 for outgoing queries - add an IPv4 address (like '0.0.0.0') to query-local-address to enable"<<endl;
   }
 
 
@@ -4178,6 +4178,11 @@ static int serviceMain(int argc, char*argv[])
     g_log<<Logger::Warning<<"NOT using IPv6 for outgoing queries - add an IPv6 address (like '::') to query-local-address to enable"<<endl;
   }
 
+  if (!(SyncRes::s_doIPv6 && SyncRes::s_doIPv4)) {
+    g_log<<Logger::Error<<"No outgoing addresses specified! Can not continue"<<endl;
+    exit(99);
+  }
+
   // keep this ABOVE loadRecursorLuaConfig!
   if(::arg()["dnssec"]=="off")
     g_dnssecmode=DNSSECMode::Off;
diff --git a/pdns/recursordist/test-syncres_cc10.cc b/pdns/recursordist/test-syncres_cc10.cc
index c7a8708d58..61182c3a99 100644
--- a/pdns/recursordist/test-syncres_cc10.cc
+++ b/pdns/recursordist/test-syncres_cc10.cc
@@ -106,8 +106,6 @@ BOOST_AUTO_TEST_CASE(test_outgoing_v6_only_no_AAAA_in_delegation)
 
   const DNSName target("powerdns.com.");
   sr->setAsyncCallback([target, &queries](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, LWResult* res, bool* chained) {
-    cout<<ip.toString()<<endl;
-    cout<<domain<<"|"<<type<<endl;
     queries++;
     if (isRootServer(ip)) {
       setLWResult(res, 0, false, false, true);