From 40cfb519f65fca9d85e824f77efd3008aa010a01 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 4 Jul 2018 10:12:38 +1000 Subject: [PATCH 1/3] use extracted netaddr rather than client->destaddr (cherry picked from commit 69fd3f5ba4bb6d3b4adb13d1f21f562c0b3908f2) --- bin/named/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/named/query.c b/bin/named/query.c index accbf3b24d..f075c64162 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -9253,7 +9253,7 @@ log_tat(ns_client_t *client) { isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); dns_name_format(client->query.qname, namebuf, sizeof(namebuf)); - isc_netaddr_format(&client->destaddr, clientbuf, sizeof(clientbuf)); + isc_netaddr_format(&netaddr, clientbuf, sizeof(clientbuf)); dns_rdataclass_format(client->view->rdclass, classname, sizeof(classname)); From 078962a616a5a07061947d5bffc6f5d444d06314 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 4 Jul 2018 10:19:53 +1000 Subject: [PATCH 2/3] fix spelling of 'telemetry' (cherry picked from commit 4f18b6a09a9edb1d6e32cb4b213d61f53726331f) --- CHANGES | 6 +++--- lib/dns/include/dns/name.h | 2 +- lib/dns/name.c | 2 +- lib/dns/tests/name_test.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 51f8f04e91..877321b66d 100644 --- a/CHANGES +++ b/CHANGES @@ -507,8 +507,8 @@ 4761. [protocol] Add support for DOA. [RT #45612] -4759. [func] Add logging channel "trust-anchor-telementry" to - record trust-anchor-telementry in incoming requests. +4759. [func] Add logging channel "trust-anchor-telemetry" to + record trust-anchor-telemetry in incoming requests. Both _ta-XXXX./NULL and EDNS KEY-TAG options are logged. [RT #46124] @@ -553,7 +553,7 @@ tests when running on terminals that support them. [RT #45977] -4744. [bug] Suppress trust-anchor-telementry queries if +4744. [bug] Suppress trust-anchor-telemetry queries if validation is disabled. [RT #46131] 4741. [bug] Make isc_refcount_current() atomically read the diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index be74667ccb..8d111de6fa 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -1338,7 +1338,7 @@ dns_name_isula(const dns_name_t *owner); isc_boolean_t dns_name_istat(const dns_name_t *name); /* - * Determine if 'name' is a potential 'trust-anchor-telementry' name. + * Determine if 'name' is a potential 'trust-anchor-telemetry' name. */ ISC_LANG_ENDDECLS diff --git a/lib/dns/name.c b/lib/dns/name.c index e597c63ebb..9ef7530520 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -2706,7 +2706,7 @@ dns_name_istat(const dns_name_t *name) { /* * Is there at least one trust anchor reported and is the - * label length consistent with a trust-anchor-telementry label. + * label length consistent with a trust-anchor-telemetry label. */ if ((len < 8) || (len - 3) % 5 != 0) { return (ISC_FALSE); diff --git a/lib/dns/tests/name_test.c b/lib/dns/tests/name_test.c index 42613f89b8..f5104bd68f 100644 --- a/lib/dns/tests/name_test.c +++ b/lib/dns/tests/name_test.c @@ -278,7 +278,7 @@ ATF_TC_BODY(compression, tc) { ATF_TC(istat); ATF_TC_HEAD(istat, tc) { - atf_tc_set_md_var(tc, "descr", "is trust-anchor-telementry test"); + atf_tc_set_md_var(tc, "descr", "is trust-anchor-telemetry test"); } ATF_TC_BODY(istat, tc) { dns_fixedname_t fixed; From 5ddff2b1844fa51e629d46472705899e1b1e86d3 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 4 Jul 2018 10:36:41 +1000 Subject: [PATCH 3/3] add CHANGES note --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 877321b66d..3ff6131262 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4992. [bug] The wrong address was being logged for trust anchor + telemetry queries. [GL #379] + 4990. [bug] Prevent a possible NULL reference in pkcs11-keygen. [GL #401]