From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Wed, 31 Dec 2014 16:58:06 +0000 (+0000)
Subject: force PACKAGEVERSION to string, fixes #2030
X-Git-Tag: auth-3.3.2~2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88c1f21ffc41733ddaf226628de371847c058bb7;p=thirdparty%2Fpdns.git

force PACKAGEVERSION to string, fixes #2030
---

diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc
index 02f8b7ea86..3b4bcef934 100644
--- a/pdns/secpoll-auth.cc
+++ b/pdns/secpoll-auth.cc
@@ -125,7 +125,7 @@ void doSecPoll(bool first)
   struct timeval now;
   gettimeofday(&now, 0);
 
-  string query = "auth-" PACKAGEVERSION ".security-status."+::arg()["security-poll-suffix"];
+  string query = "auth-" + string(PACKAGEVERSION) +".security-status."+::arg()["security-poll-suffix"];
 
   if(*query.rbegin()!='.')
     query+='.';
@@ -152,7 +152,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 '" + string(PACKAGEVERSION) + "' on '"+query+"', RCODE = "<< RCode::to_s(res)<<endl;
     if(security_status == 1) // it was ok, not it is unknown
       security_status = 0;
   }