From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 10 Feb 2012 17:07:28 +0000 (+0000)
Subject: Make sure we always group RRs while generating RRSIGs. Reported by Mark Scholten.
X-Git-Tag: auth-3.1-rc1~145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dca357a19895ba6a203eeeee5b2adbd4b090e1b4;p=pdns

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 5d3fe573a..a5a2917cb 100644
--- 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)