last bits and pieces

diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index b4385e5d8214acfea9e5fd03242c8128553234b1..ccb03f98bc96b7b810e4940b8101b27f94bdf16a 100644 (file)
--- a/pdns/pdns.conf-dist
+++ b/pdns/pdns.conf-dist
@@ -314,6 +314,11 @@
 #
 # retrieval-threads=2
 
+#################################
+# security-poll-suffix Domain name from which to query security update notifications
+#
+# security-poll-suffix=secpoll.powerdns.com.
+
 #################################
 # send-root-referral   Send out old-fashioned root-referral instead of ServFail in case of no authority
 #

diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc
index b905cdd24ddc602e3e45b17b944d5f7773aedfac..6f22210107227250295e440dd5255b0139be2700 100644 (file)
--- a/pdns/secpoll-auth.cc
+++ b/pdns/secpoll-auth.cc
@@ -76,7 +76,7 @@ int doResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& re
     L<<Logger::Warning<<"Unable to poll PowerDNS security status, did not get any servers from resolv.conf"<<endl;
 
   BOOST_FOREACH(ComboAddress& dest, s_servers) {
-    Socket sock(dest.sin4.sin_family, SOCK_DGRAM);
+    Socket sock((AddressFamily) dest.sin4.sin_family, Datagram);
     sock.setNonBlocking();
     sock.sendTo(string((char*)&*packet.begin(), (char*)&*packet.end()), dest);
     
@@ -153,7 +153,7 @@ void doSecPoll(bool first)
 
   }
   else {
-    L<<Logger::Warning<<"Could not retrieve security status update for '" + string(PACKAGEVERSION) + "' on '"+query+"', RCODE = "<< RCode::to_s(res)<<endl;
+    L<<Logger::Warning<<"Could not retrieve security status update for '" + string(PACKAGEVERSION) + "' on '"+query+"', RCODE = "<<res<<endl;
     if(security_status == 1) // it was ok, not it is unknown
       security_status = 0;
   }

diff --git a/pdns/version.cc b/pdns/version.cc
index e576c4970550d7f59ed2bfed170aac836930ac50..4267158766987b8494e42ffe7165778300820336 100644 (file)
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -37,7 +37,7 @@ string compilerVersion()
 void showProductVersion()
 {
   theL()<<Logger::Warning<<"PowerDNS "<<productName<<" "<<PDNS_VERSION<<" ("DIST_HOST") "
-    "(C) 2001-2013 PowerDNS.COM BV" << endl;
+    "(C) 2001-2015 PowerDNS.COM BV" << endl;
   theL()<<Logger::Warning<<"Using "<<(sizeof(unsigned long)*8)<<"-bits mode. "
     "Built on "BUILD_DATE" by "BUILD_HOST", "<<compilerVersion()<<"."<<endl;
   theL()<<Logger::Warning<<"PowerDNS comes with ABSOLUTELY NO WARRANTY. "

diff --git a/pdns/ws.cc b/pdns/ws.cc
index 1581839bc325f4a7e6084e7522a4f3724fb6ca83..cd9d817bffa1a89f95591fea9cf570d53cb1619b 100644 (file)
--- a/pdns/ws.cc
+++ b/pdns/ws.cc
@@ -236,7 +236,7 @@ string StatWebServer::indexfunction(const string& method, const string& post, co
     printtable(ret,rvarmap["ring"],S.getRingTitle(rvarmap["ring"]),100);
 
   ret<<"</div></div>"<<endl;
-  ret<<"<footer class=\"row\">"<<fullVersionString()<<"<br>&copy; 2013 <a href=\"http://www.powerdns.com/\">PowerDNS.COM BV</a>.</footer>"<<endl;
+  ret<<"<footer class=\"row\">"<<fullVersionString()<<"<br>&copy; 2001-2015 <a href=\"http://www.powerdns.com/\">PowerDNS.COM BV</a>.</footer>"<<endl;
   ret<<"</body></html>"<<endl;
 
   return ret.str();