From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 27 Nov 2015 21:25:17 +0000 (+0100)
Subject: whitespace conflict. Merge branch 'master' into deforeach
X-Git-Tag: dnsdist-1.0.0-alpha1~180^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2943%2Fhead;p=thirdparty%2Fpdns.git

whitespace conflict. Merge branch 'master' into deforeach

Conflicts:
	pdns/dnssecinfra.cc
---

5f264cf5151d1d1c5ebb649df39b92ae06957b26
diff --cc pdns/dnssecinfra.cc
index 917d0b1590,4b9e0dc33f..2f30e3d832
--- a/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