From 76a89c3a44bf380ed7d8b4823ad3cc291ad5877d Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 10 Jun 2020 14:34:48 +0200
Subject: [PATCH] qla-v6 outgoing: increase chance of catching errors

---
 pdns/pdns_recursor.cc                  | 4 ++--
 pdns/recursordist/test-syncres_cc10.cc | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 71ea44bb06..26439271a6 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4178,8 +4178,8 @@ 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;
+  if (!SyncRes::s_doIPv6 && !SyncRes::s_doIPv4) {
+    g_log<<Logger::Error<<"No outgoing addresses configured! Can not continue"<<endl;
     exit(99);
   }
 
diff --git a/pdns/recursordist/test-syncres_cc10.cc b/pdns/recursordist/test-syncres_cc10.cc
index 61182c3a99..08641de489 100644
--- a/pdns/recursordist/test-syncres_cc10.cc
+++ b/pdns/recursordist/test-syncres_cc10.cc
@@ -19,6 +19,8 @@ BOOST_AUTO_TEST_CASE(test_outgoing_v4_only)
     queries++;
     if (isRootServer(ip)) {
       setLWResult(res, 0, false, false, true);
+      v4Hit |= ip.isIPv4();
+      v6Hit |= ip.isIPv6();
 
       if (domain == DNSName("powerdns.com.")) {
         addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800);
@@ -29,7 +31,7 @@ BOOST_AUTO_TEST_CASE(test_outgoing_v4_only)
     }
     else if (ip == ComboAddress("192.0.2.1:53")) {
       setLWResult(res, 0, true, false, false);
-      v4Hit = true;
+      v4Hit |= true;
       if (domain == DNSName("powerdns.com.")) {
         addRecordToLW(res, domain, QType::A, "192.0.2.2");
       }
@@ -37,7 +39,7 @@ BOOST_AUTO_TEST_CASE(test_outgoing_v4_only)
     }
     else if (ip == ComboAddress("[2001:DB8:1::53]:53")) {
       setLWResult(res, 0, true, false, false);
-      v6Hit = true;
+      v6Hit |= true;
       if (domain == DNSName("powerdns.com.")) {
         addRecordToLW(res, domain, QType::A, "192.0.2.2");
       }
-- 
2.47.2