From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sun, 28 Dec 2014 13:39:28 +0000 (+0100)
Subject: prevent spurious recompilations to get the latest and greatest version string
X-Git-Tag: rec-3.7.0-rc1~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77b9f5ff5e4d1c7790b8a989eb539fa3ee9c8b20;p=pdns

prevent spurious recompilations to get the latest and greatest version string
---

diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index f29128aa0..73ded636e 100644
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -12,6 +12,7 @@
 #include <boost/format.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
+#include "version.hh"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -22,7 +23,7 @@
 #include <sys/time.h>
 #include "lock.hh"
 #include "responsestats.hh"
-#include "version_generated.h"
+
 #include "secpoll-recursor.hh"
 #include "pubsuffix.hh"
 #include "namespaces.hh"
@@ -845,7 +846,7 @@ string RecursorControlParser::getAnswer(const string& question, RecursorControlP
   }
 
   if(cmd=="version") {
-    return string(PDNS_VERSION)+"\n";
+    return getPDNSVersion()+"\n";
   }
   
   if(cmd=="quit-nicely") {
diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc
index 02f8b7ea8..137753a58 100644
--- a/pdns/secpoll-auth.cc
+++ b/pdns/secpoll-auth.cc
@@ -3,7 +3,6 @@
 #include "logger.hh"
 #include "arguments.hh"
 #include "version.hh"
-#include "version_generated.h"
 #include "dnsparser.hh"
 #include "misc.hh"
 #include <boost/foreach.hpp>
@@ -14,7 +13,7 @@
 #include "statbag.hh"
 #include <stdint.h>
 #ifndef PACKAGEVERSION 
-#define PACKAGEVERSION PDNS_VERSION
+#define PACKAGEVERSION getPDNSVersion()
 #endif
 
 string g_security_message;
@@ -125,7 +124,7 @@ void doSecPoll(bool first)
   struct timeval now;
   gettimeofday(&now, 0);
 
-  string query = "auth-" PACKAGEVERSION ".security-status."+::arg()["security-poll-suffix"];
+  string query = "auth-" +PACKAGEVERSION +".security-status."+::arg()["security-poll-suffix"];
 
   if(*query.rbegin()!='.')
     query+='.';
@@ -152,7 +151,7 @@ void doSecPoll(bool first)
 
   }
   else {
-    L<<Logger::Warning<<"Could not retrieve security status update for '" PACKAGEVERSION "' on '"+query+"', 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(security_status == 1) // it was ok, not it is unknown
       security_status = 0;
   }
diff --git a/pdns/secpoll-recursor.cc b/pdns/secpoll-recursor.cc
index 2d9e49232..96c8a46e8 100644
--- a/pdns/secpoll-recursor.cc
+++ b/pdns/secpoll-recursor.cc
@@ -3,10 +3,10 @@
 #include "logger.hh"
 #include "arguments.hh"
 #include "version.hh"
-#include "version_generated.h"
+
 #include <stdint.h>
 #ifndef PACKAGEVERSION 
-#define PACKAGEVERSION PDNS_VERSION
+#define PACKAGEVERSION getPDNSVersion()
 #endif
 
 uint32_t g_security_status;
@@ -23,7 +23,7 @@ void doSecPoll(time_t* last_secpoll)
   
   vector<DNSResourceRecord> ret;
 
-  string query = "recursor-" PACKAGEVERSION ".security-status."+::arg()["security-poll-suffix"];
+  string query = "recursor-" +PACKAGEVERSION+ ".security-status."+::arg()["security-poll-suffix"];
 
   if(*query.rbegin()!='.')
     query+='.';
@@ -46,7 +46,7 @@ void doSecPoll(time_t* last_secpoll)
     *last_secpoll=now.tv_sec;
   }
   else {
-    L<<Logger::Warning<<"Could not retrieve security status update for '" PACKAGEVERSION "' on '"+query+"', 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) // it was ok, not it is unknown
       g_security_status = 0;
     if(res == RCode::NXDomain) // if we had servfail, keep on trying more more frequently
diff --git a/pdns/version.cc b/pdns/version.cc
index 167eb3be6..ccbe49119 100644
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -49,6 +49,11 @@ string productName() {
   return "Unknown";
 }
 
+string getPDNSVersion()
+{
+  return PDNS_VERSION;
+}
+
 // REST API product type
 string productTypeApiType() {
   switch (productType) {
diff --git a/pdns/version.hh b/pdns/version.hh
index 8893d7ddd..2a70c0f23 100644
--- a/pdns/version.hh
+++ b/pdns/version.hh
@@ -30,6 +30,7 @@ string compilerVersion();
 void showProductVersion();
 void showBuildConfiguration();
 string fullVersionString();
+string getPDNSVersion();
 string productName();
 string productTypeApiType();
 void versionSetProduct(ProductType pt);