From: Otto <otto.moerbeek@open-xchange.com>
Date: Wed, 6 Oct 2021 08:37:28 +0000 (+0200)
Subject: Minimal backport of #10632: match ordering of PacketID using the
X-Git-Tag: rec-4.5.6~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10809%2Fhead;p=thirdparty%2Fpdns.git

Minimal backport of #10632: match ordering of PacketID using the
Birtdah vs non-Birtday comparator
---

diff --git a/pdns/syncres.hh b/pdns/syncres.hh
index f10c82de25..56f4bb07d6 100644
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@ -974,7 +974,7 @@ struct PacketID
     if( tie(remote, ourSock, type) > tie(b.remote, bSock, b.type))
       return false;
 
-    return tie(fd, id, domain) < tie(b.fd, b.id, b.domain);
+    return tie(domain, fd, id) < tie(b.domain, b.fd, b.id);
   }
 };