upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-14 21:50:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '379-trust-anchor-telemetry-log-should-include-client-ip-address-v9_11' into 'v9_11'

Browse source 
Resolve "trust anchor telemetry log should include client IP address"

See merge request isc-projects/bind9!501
This commit is contained in:
Evan Hunt 2018-07-10 21:37:46 -04:00
commit 7903d0316d
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGES
View file

@ -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]
@ -507,8 +510,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.<anchor>/NULL and EDNS KEY-TAG options
are logged. [RT #46124]
@ -553,7 +556,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

2
bin/named/query.c
View file

@ -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));

2
lib/dns/include/dns/name.h
View file

@ -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

2
lib/dns/name.c
View file

@ -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);

2
lib/dns/tests/name_test.c
View file

@ -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;