From e125fc6920b89eeb49fee8d02576f9b48da81567 Mon Sep 17 00:00:00 2001
From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 5 Feb 2014 11:35:33 +0100
Subject: [PATCH] manual merge of Aki Tuomi's pull request #1263. Thanks!

---
 pdns/common_startup.cc |  2 +-
 pdns/dbdnsseckeeper.cc |  4 +---
 pdns/dns.cc            |  4 ++--
 pdns/dnssecsigner.cc   |  3 +--
 pdns/lwres.cc          | 14 +-------------
 pdns/signingpipe.cc    |  4 ++--
 pdns/syncres.cc        |  2 ++
 7 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 7db509fb4d..f73afee001 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -252,7 +252,7 @@ void *qthread(void *number)
 
   // If we have SO_REUSEPORT then create a new port for all receiver threads
   // other than the first one.
-  if( number > 0 && NS->canReusePort() ) {
+  if( number != NULL && NS->canReusePort() ) {
     L<<Logger::Notice<<"Starting new listen thread on the same IPs/ports using SO_REUSEPORT"<<endl;
     NS = new UDPNameserver( true );
   }
diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc
index 2e9110c659..b7eada4bf5 100644
--- a/pdns/dbdnsseckeeper.cc
+++ b/pdns/dbdnsseckeeper.cc
@@ -67,8 +67,6 @@ bool DNSSECKeeper::isSecuredZone(const std::string& zone)
       else
         return true;
     }
-    else
-      ; 
   }  
   keyset_t keys = getKeys(zone, true); // does the cache
   
@@ -382,7 +380,7 @@ bool DNSSECKeeper::getPreRRSIGs(DNSBackend& db, const std::string& signer, const
                         rr.ttl = signTTL;
                         rrsigs.push_back(rr);
                 }
-                else ; // cerr<<"Skipping!"<<endl;
+                // else cerr<<"Skipping!"<<endl;
         }
         return true;
 }
diff --git a/pdns/dns.cc b/pdns/dns.cc
index 4b1260873c..9fdfbe35b2 100644
--- a/pdns/dns.cc
+++ b/pdns/dns.cc
@@ -36,11 +36,11 @@ public:
     {}
   
     
-  const char operator[](unsigned int offset) const
+  char operator[](unsigned int offset) const
   {
     if(offset < d_length)
       return d_ptr[offset];
-    else throw runtime_error("out of bounds: "+boost::lexical_cast<string>(offset)+" >= " + boost::lexical_cast<string>(d_length));
+    throw runtime_error("out of bounds: "+boost::lexical_cast<string>(offset)+" >= " + boost::lexical_cast<string>(d_length));
   }
 private:  
   const char* d_ptr;
diff --git a/pdns/dnssecsigner.cc b/pdns/dnssecsigner.cc
index e5d3de55c8..55b8fd8138 100644
--- a/pdns/dnssecsigner.cc
+++ b/pdns/dnssecsigner.cc
@@ -139,8 +139,7 @@ void fillOutRRSIG(DNSSECPrivateKey& dpk, const std::string& signQName, RRSIGReco
       rrc.d_signature=iter->second;
       return;
     }
-    else
-      ; // cerr<<"Miss!"<<endl;
+    // else cerr<<"Miss!"<<endl;  
   }
   
   rrc.d_signature = rc->sign(msg);
diff --git a/pdns/lwres.cc b/pdns/lwres.cc
index 7c308e47a3..25718dfe63 100644
--- a/pdns/lwres.cc
+++ b/pdns/lwres.cc
@@ -1,6 +1,6 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002 - 2010 PowerDNS.COM BV
+    Copyright (C) 2002 - 2014 PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 2 as 
@@ -45,18 +45,6 @@
 #include <boost/scoped_array.hpp>
 #include <boost/algorithm/string.hpp>
 
-string dns0x20(const std::string& in)
-{
-  string ret(in);
-  string::size_type len=ret.size();
-  for(string::size_type pos = 0 ; pos < len; ++pos) {
-    if(isalpha(in[pos]) && dns_random(2))
-      ret[pos]^=0x20;
-  }
-  //  cerr<<"'"<<in<<"' -> '"<<ret<<"'\n";
-  return ret;
-}
-
 //! returns -2 for OS limits error, -1 for permanent error that has to do with remote **transport**, 0 for timeout, 1 for success
 /** lwr is only filled out in case 1 was returned, and even when returning 1 for 'success', lwr might contain DNS errors
     Never throws! 
diff --git a/pdns/signingpipe.cc b/pdns/signingpipe.cc
index 48c76c497d..46b31796f7 100644
--- a/pdns/signingpipe.cc
+++ b/pdns/signingpipe.cc
@@ -330,8 +330,8 @@ vector<DNSResourceRecord> ChunkedSigningPipe::getChunk(bool final)
   d_chunks.pop_front();
   if(d_chunks.empty())
     d_chunks.push_back(vector<DNSResourceRecord>());
-  if(d_final && front.empty())
-    ; // cerr<<"getChunk returning empty in final"<<endl;
+/*  if(d_final && front.empty())
+      cerr<<"getChunk returning empty in final"<<endl; */
   return front;
 }
 
diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 1b94a83d88..e5c39ead7f 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -278,6 +278,8 @@ int SyncRes::asyncresolveWrapper(const ComboAddress& ip, const string& domain, i
      If '4', send bare queries
   */
 
+  return asyncresolve(ip, domain, type, doTCP, sendRDQuery, true, now, res);
+
   if(s_noEDNS) {
     g_stats.noEdnsOutQueries++;
     return asyncresolve(ip, domain, type, doTCP, sendRDQuery, 0, now, res);
-- 
2.47.3