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 f10c82de257d4bd4be8c3ee69a20e58e5229b5e9..56f4bb07d6c3bae83a68c20caac3d99c87074146 100644 (file)
--- 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);
   }
 };