From 4f9f2154904e6e7eb7cb03fa09a9be5d55ccacd4 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 18 Jun 2019 17:23:13 +0200
Subject: [PATCH] secpoll: Fix log messages for non-releases

Fixes #7895
---
 pdns/dnsdistdist/dnsdist-secpoll.cc | 2 +-
 pdns/secpoll-auth.cc                | 6 +++---
 pdns/secpoll-recursor.cc            | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pdns/dnsdistdist/dnsdist-secpoll.cc b/pdns/dnsdistdist/dnsdist-secpoll.cc
index 259739ed6..5bd32db18 100644
--- 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 66656d5e2..4166108e0 100644
--- 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 d88a7eb1a..5e1ecd268 100644
--- 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;
-- 
2.40.0