From 3ad03d756307d05e631eee1eeb4013216d12a262 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 21 Mar 2016 17:45:46 +0100
Subject: [PATCH] Improve trace messages for auth and forward zones

---
 pdns/syncres.cc | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index caaf1058c9..79665b64da 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -1169,22 +1169,6 @@ int SyncRes::doResolveAt(NsSet &nameservers, DNSName auth, bool flawedNSSet, con
           continue;
         }
 
-        // Check if we are authoritative for a zone in this answer
-        if (!t_sstorage->domainmap->empty()) {
-          DNSName tmp_qname(rec.d_name);
-          auto auth_domain_iter=getBestAuthZone(&tmp_qname);
-          if(auth_domain_iter!=t_sstorage->domainmap->end()) {
-            if (auth_domain_iter->first != auth) {
-              LOG("NO! - we are authoritative for the zone "<<auth_domain_iter->first.toString()<<endl);
-              continue;
-            } else {
-              // ugly...
-              LOG("YES! - This answer was either retrieved from the local auth store or from a server we forward to."<<endl);
-            }
-          }
-        }
-
-
         if(rec.d_name.isPartOf(auth)) {
           if(lwr.d_aabit && lwr.d_rcode==RCode::NoError && rec.d_place==DNSResourceRecord::ANSWER && g_delegationOnly.check(auth)) {
             LOG("NO! Is from delegation-only zone"<<endl);
@@ -1195,7 +1179,30 @@ int SyncRes::doResolveAt(NsSet &nameservers, DNSName auth, bool flawedNSSet, con
 	    LOG("RRSIG - separate"<<endl);
 	  }
           else {
-            LOG("YES!"<<endl);
+            bool haveLogged = false;
+            if (!t_sstorage->domainmap->empty()) {
+              // Check if we are authoritative for a zone in this answer
+              DNSName tmp_qname(rec.d_name);
+              auto auth_domain_iter=getBestAuthZone(&tmp_qname);
+              if(auth_domain_iter!=t_sstorage->domainmap->end()) {
+                if (auth_domain_iter->first != auth) {
+                  LOG("NO! - we are authoritative for the zone "<<auth_domain_iter->first.toString()<<endl);
+                  continue;
+                } else {
+                  LOG("YES! - This answer was ");
+                  if (nameservers[*tns].first.empty()) {
+                    LOG("retrieved from the local auth store.");
+                  } else {
+                    LOG("received from a server we forward to.");
+                  }
+                  haveLogged = true;
+                  LOG(endl);
+                }
+              }
+            }
+            if (!haveLogged) {
+              LOG("YES!"<<endl);
+            }
 
             rec.d_ttl=min(s_maxcachettl, rec.d_ttl);
 
-- 
2.47.2