secpoll: Fix log messages for non-releases

Fixes #7895

diff --git a/pdns/dnsdistdist/dnsdist-secpoll.cc b/pdns/dnsdistdist/dnsdist-secpoll.cc
index 259739ed6338fca717cfe2f3b54226530bf4a4f5..5bd32db18765ce70151bd507de8faf8547c5d10e 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-secpoll.cc
+++ b/pdns/dnsdistdist/dnsdist-secpoll.cc
@@ -192,7 +192,7 @@ void doSecPoll(const std::string& suffix)
   }
 
   const std::string pkgv(PACKAGEVERSION);
-  bool releaseVersion = pkgv.find("0.0.") != 0;
+  bool releaseVersion = std::count(pkgv.begin(), pkgv.end(), '.') == 2;
   const std::string version = "dnsdist-" + pkgv;
   std::string queriedName = version.substr(0, 63) + ".security-status." + suffix;
 

diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc
index 66656d5e2f13395b435066e4f55a9e5b36b817c4..4166108e04e52da534a126f4b9fc36b3a9c53bbd 100644 (file)
--- a/pdns/secpoll-auth.cc
+++ b/pdns/secpoll-auth.cc
@@ -62,10 +62,10 @@ void doSecPoll(bool first)
   }
   else {
     string pkgv(PACKAGEVERSION);
-    if(pkgv.find("0.0.") != 0)
-      g_log<<Logger::Warning<<"Could not retrieve security status update for '" + pkgv + "' on '"+query+"', RCODE = "<< RCode::to_s(res)<<endl;
-    else
+    if (std::count(pkgv.begin(), pkgv.end(), '.') > 2)
       g_log<<Logger::Warning<<"Not validating response for security status update, this is a non-release version."<<endl;
+    else
+      g_log<<Logger::Warning<<"Could not retrieve security status update for '" + pkgv + "' on '"+query+"', RCODE = "<< RCode::to_s(res)<<endl;
   }
 
   if(security_status == 1 && first) {

diff --git a/pdns/secpoll-recursor.cc b/pdns/secpoll-recursor.cc
index d88a7eb1a7307392d4e60fd534e32147093111a0..5e1ecd268388fa5f60ef1385672813d10a09b9e4 100644 (file)
--- a/pdns/secpoll-recursor.cc
+++ b/pdns/secpoll-recursor.cc
@@ -78,10 +78,10 @@ void doSecPoll(time_t* last_secpoll)
     g_security_message = split.second;
   }
   else {
-    if(pkgv.find("0.0.") != 0)
-      g_log<<Logger::Warning<<"Could not retrieve security status update for '" +pkgv+ "' on '"<<query<<"', RCODE = "<< RCode::to_s(res)<<endl;
-    else
+    if (std::count(pkgv.begin(), pkgv.end(), '.') > 2)
       g_log<<Logger::Warning<<"Ignoring response for security status update, this is a non-release version."<<endl;
+    else
+      g_log<<Logger::Warning<<"Could not retrieve security status update for '" +pkgv+ "' on '"<<query<<"', RCODE = "<< RCode::to_s(res)<<endl;
 
     if(g_security_status == 1) // it was ok, now it is unknown
       g_security_status = 0;