From debb94462fd4892149bef63227dbe381b6f78454 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Thu, 27 Sep 2018 17:17:30 -0700 Subject: [PATCH] fix chaosnet address comparison (cherry picked from commit b4dca44ad268a1f3ecca097e4076160957779048) --- CHANGES | 3 +++ lib/dns/rdata/ch_3/a_1.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index df42052879..704e5132f4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5038. [bug] Chaosnet addresses were compared incorrectly. + [GL #562] + 5034. [bug] A race between threads could prevent zone maintenance scheduled immediately after zone load from being performed. [GL #542] diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c index a1b571fa14..94cae92c3c 100644 --- a/lib/dns/rdata/ch_3/a_1.c +++ b/lib/dns/rdata/ch_3/a_1.c @@ -179,7 +179,7 @@ compare_ch_a(ARGS_COMPARE) { if (order != 0) return (order); - order = memcmp(rdata1->data, rdata2->data, 2); + order = memcmp(region1.base, region2.base, 2); if (order != 0) order = (order < 0) ? -1 : 1; return (order);