whitespace conflict. Merge branch 'master' into deforeach

Conflicts:
	pdns/dnssecinfra.cc

diff --cc pdns/dnsrecords.cc
Simple merge

diff --cc pdns/dnssecinfra.cc
index 917d0b1590b7c563cccefbb64db7113ec8fb209f,4b9e0dc33f4c4182cb39b326b5e9c154304c99d6..2f30e3d832ee162fe5aa3df1fa529addbe52a122
--- 1/pdns/dnssecinfra.cc
--- 2/pdns/dnssecinfra.cc
+++ b/pdns/dnssecinfra.cc
@@@ -306,11 -306,11 +306,11 @@@ string getMessageForRRSET(const DNSName
    sort(signRecords.begin(), signRecords.end(), sharedDNSSECCompare);
  
    string toHash;
-   toHash.append(const_cast<RRSIGRecordContent&>(rrc).serialize(DNSName(), true, true));
+   toHash.append(const_cast<RRSIGRecordContent&>(rrc).serialize(DNSName("."), true, true));
    toHash.resize(toHash.size() - rrc.d_signature.length()); // chop off the end, don't sign the signature!
  
 -  BOOST_FOREACH(shared_ptr<DNSRecordContent>& add, signRecords) {
 -    toHash.append(qname.toDNSString()); // FIXME400 tolower? 
 +  for(shared_ptr<DNSRecordContent>& add :  signRecords) {
 +    toHash.append(qname.toDNSString()); // FIXME400 tolower?
      uint16_t tmp=htons(rrc.d_type);
      toHash.append((char*)&tmp, 2);
      tmp=htons(1); // class

diff --cc pdns/pdns_recursor.cc
Simple merge