Make sure we always group RRs while generating RRSIGs. Reported by Mark Scholten.

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2381 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/dnssecsigner.cc b/pdns/dnssecsigner.cc
index 5d3fe573a841efe235e749183e77f7113104ee64..a5a2917cbd2142dcfa47b979702b0b8ad6101944 100644 (file)
--- a/pdns/dnssecsigner.cc
+++ b/pdns/dnssecsigner.cc
@@ -146,7 +146,7 @@ void fillOutRRSIG(DNSSECPrivateKey& dpk, const std::string& signQName, RRSIGReco
 
 static bool rrsigncomp(const DNSResourceRecord& a, const DNSResourceRecord& b)
 {
-  return a.d_place < b.d_place;
+  return tie(a.d_place, a.qtype) < tie(b.d_place, b.qtype);
 }
 
 static bool getBestAuthFromSet(const set<string, CIStringCompare>& authSet, const string& name, string& auth)