diff --git a/lib/Zonemaster/Engine/Test/Consistency.pm b/lib/Zonemaster/Engine/Test/Consistency.pm index 133020e56..7502064e8 100644 --- a/lib/Zonemaster/Engine/Test/Consistency.pm +++ b/lib/Zonemaster/Engine/Test/Consistency.pm @@ -246,7 +246,7 @@ Readonly my %TAG_DESCRIPTIONS => ( }, CS05_OOD_ADDR_MISMATCH => sub { __x # CONSISTENCY:CS05_OOD_ADDR_MISMATCH -'For name server {nsname} the glue record in the delegation "{ns_ip_list_glue}" is different from the address record in the child zone "{ns_ip_list_zone}".', + 'For name server {nsname} the glue record in the delegation "{ns_ip_list_glue}" is different from the DNS record found through lookup "{ns_ip_list_lookup}"', @_; }, IPV4_DISABLED => sub { @@ -1054,12 +1054,12 @@ sub consistency05 { if ( not $lookup->is_empty() ) { if ( not $set->equals( $lookup ) ) { push @results, - _emit_log( + _emit_log( CS05_OOD_ADDR_MISMATCH => { - nsname => $n, - ns_ip_list_ref => join( ";", map { $_->address() } $set->sorted_items() ), - ns_ip_list_lookup => join( ";", map { $_->address() } $lookup->sorted_items() ), - } + nsname => $n, + ns_ip_list_glue => join( ";", map { $_->address()->short() } $set->sorted_items() ), + ns_ip_list_lookup => join( ";", map { $_->address()->short() } $lookup->sorted_items() ) + } ); } } diff --git a/t/Test-consistency05.t b/t/Test-consistency05.t index a640e8249..989757967 100644 --- a/t/Test-consistency05.t +++ b/t/Test-consistency05.t @@ -154,8 +154,13 @@ scenario 'NO-NS-ADDR-CHILD-2' => sub { scenario 'OOD-ADDR-MISMATCH' => sub { zone 'child.{SCENARIO}.{TESTCASE}.xa'; - - expect 'CS05_OOD_ADDR_MISMATCH'; + expect 'CS05_OOD_ADDR_MISMATCH' => { + nsname => 'ns1.sibbling.ood-addr-mismatch.consistency05.xa', + ns_ip_list_glue => '127.14.5.39;' + . 'fda1:b2:c3:0:127:14:5:39', + ns_ip_list_lookup => '127.14.5.33;' + . 'fda1:b2:c3:0:127:14:5:33', + }; forbid_others; };