auth: limit long version strings to 63 characters and catch exceptions in secpoll

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 10e196a28fb66f3d15edc831bb2bead5aa728fc2..142498d435bd1dbfdcf8e2dd8cf5af23b7174314 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -342,7 +342,10 @@ void mainthread()
    
 #ifndef WIN32
 
-   doSecPoll(true); // this must be BEFORE chroot
+   try {
+     doSecPoll(true); // this must be BEFORE chroot
+   }
+   catch(...) {}
 
    if(!::arg()["chroot"].empty()) {  
      if(::arg().mustDo("master") || ::arg().mustDo("slave"))

diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc
index 3b4bcef934f92a0722de4f04f212338125a624b7..b905cdd24ddc602e3e45b17b944d5f7773aedfac 100644 (file)
--- a/pdns/secpoll-auth.cc
+++ b/pdns/secpoll-auth.cc
@@ -125,7 +125,8 @@ void doSecPoll(bool first)
   struct timeval now;
   gettimeofday(&now, 0);
 
-  string query = "auth-" + string(PACKAGEVERSION) +".security-status."+::arg()["security-poll-suffix"];
+  string version = "auth-" + string(PACKAGEVERSION);
+  string query = version.substr(0, 63) +".security-status."+::arg()["security-poll-suffix"];
 
   if(*query.rbegin()!='.')
     query+='.';