From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 21 Oct 2014 14:48:50 +0000 (+0200)
Subject: improve error message on reporting failed secpoll retrieval
X-Git-Tag: rec-3.7.0-rc1~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c85e51f84fa132846c45375e5ad3df2b5cf189e;p=thirdparty%2Fpdns.git

improve error message on reporting failed secpoll retrieval
---

diff --git a/pdns/secpoll-recursor.cc b/pdns/secpoll-recursor.cc
index 284be75910..35e43edd37 100644
--- a/pdns/secpoll-recursor.cc
+++ b/pdns/secpoll-recursor.cc
@@ -2,9 +2,11 @@
 #include "syncres.hh"
 #include "logger.hh"
 #include "arguments.hh"
+#include "version.hh"
+#include "version_generated.h"
 
 #ifndef PACKAGEVERSION 
-#define PACKAGEVERSION VERSION
+#define PACKAGEVERSION PDNS_VERSION
 #endif
 
 uint32_t g_security_status;
@@ -21,7 +23,9 @@ void doSecPoll(time_t* last_secpoll)
   
   vector<DNSResourceRecord> ret;
 
-  int res=sr.beginResolve("recursor-" PACKAGEVERSION ".security-status."+::arg()["security-poll-suffix"], QType(QType::TXT), 1, ret);
+  string query = "recursor-" PACKAGEVERSION ".security-status."+::arg()["security-poll-suffix"];
+
+  int res=sr.beginResolve(query, QType(QType::TXT), 1, ret);
   if(!res && !ret.empty()) {
     string content=ret.begin()->content;
     if(!content.empty() && content[0]=='"' && content[content.size()-1]=='"') {
@@ -36,7 +40,7 @@ void doSecPoll(time_t* last_secpoll)
     *last_secpoll=now.tv_sec;
   }
   else {
-    L<<Logger::Warning<<"Could not retrieve security status update for '" PACKAGEVERSION "', RCODE = "<< RCode::to_s(res)<<endl;
+    L<<Logger::Warning<<"Could not retrieve security status update for '" PACKAGEVERSION "' on '"+query+"', RCODE = "<< RCode::to_s(res)<<endl;
     if(g_security_status == 1)
       g_security_status = 0;
   }