Update Basic01 - minor fixes

zonemaster · May 22, 2023 · 7bd562d · 7bd562d
1 parent dec3593
commit 7bd562d
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/lib/Zonemaster/Engine/Test/Basic.pm b/lib/Zonemaster/Engine/Test/Basic.pm
@@ -509,18 +509,19 @@ sub basic01 {
         push @handled_servers, $ns_labels[1];
 
         my $ns = ns( $ns_labels[0], $ns_labels[1] );
-        my $query_type = q{NS};
 
         foreach my $zone_name ( keys %{ $parent_information{$ns_string} } ) {
+            my $query_type = q{NS};
+
             if ( _ip_disabled_message( \@results, $ns, $query_type ) ) {
                 next;
             }
             _ip_enabled_message( \@results, $ns, $query_type );
 
             my $p = $ns->query( $zone_name, $query_type );
 
-            if ( $p and $p->get_records_for_name( 'NS', $zone_name, q{answer} ) ) {
-                foreach my $rr ( $p->get_records_for_name( 'NS', $zone_name, q{answer} ) ) {
+            if ( $p and $p->get_records_for_name( $query_type, $zone_name, q{answer} ) ) {
+                foreach my $rr ( $p->get_records_for_name( $query_type, $zone_name, q{answer} ) ) {
                     my @ips;
                     my $p_a = Zonemaster::Engine::Recursor->recurse( $rr->nsdname, q{A} );
 
@@ -530,7 +531,7 @@ sub basic01 {
 
                     my $p_aaaa = Zonemaster::Engine::Recursor->recurse( $rr->nsdname, q{AAAA} );
 
-                    if ( $p_aaaa ){
+                    if ( $p_aaaa ) {
                         push @ips, $_->address for $p_aaaa->get_records_for_name( q{AAAA}, $rr->nsdname, q{answer} );
                     }
 
@@ -549,7 +550,7 @@ sub basic01 {
                             my $pass = 0;
 
                             if ( $new_p ) {
-                                if ( $new_p->is_redirect and scalar $new_p->get_records_for_name( 'NS', $zone->name->fqdn, q{authority} ) ) {
+                                if ( $new_p->is_redirect and scalar $new_p->get_records_for_name( 'NS', $zone->name->string, q{authority} ) ) {
                                     $pass += 1;
                                 }
 
@@ -602,19 +603,19 @@ sub basic01 {
 
                 if ( $p->aa and $p->no_such_record ) {
                     my @ns_labels = split( '/', $ns_string );
-                    my $new_ns = ns( $ns_labels[0], $ns_labels[1] );
+                    my $ns = ns( $ns_labels[0], $ns_labels[1] );
                     my $query_type = 'DNAME';
 
-                    if ( _ip_disabled_message( \@results, $new_ns, $query_type ) ) {
+                    if ( _ip_disabled_message( \@results, $ns, $query_type ) ) {
                         next;
                     }
-                    _ip_enabled_message( \@results, $new_ns, $query_type );
+                    _ip_enabled_message( \@results, $ns, $query_type );
 
-                    my $new_p = $new_ns->query( $zone->name->string, $query_type );
+                    my $new_p = $ns->query( $zone->name->string, $query_type );
 
-                    if ( $new_p and $new_p->aa and $new_p->rcode eq 'NOERROR' and scalar $new_p->get_records_for_name( 'DNAME', $zone->name->string, q{answer} ) ) {
+                    if ( $new_p and $new_p->aa and $new_p->rcode eq 'NOERROR' and scalar $new_p->get_records_for_name( $query_type, $zone->name->string, q{answer} ) ) {
                         push @{ $parent_found{$zone_name} }, $ns_string;
-                        push @{ $aa_dname{( $new_p->get_records_for_name( 'DNAME', $zone->name->fqdn, q{answer} ) )[0]->dname}{$zone_name} }, $ns_string;
+                        push @{ $aa_dname{$_->dname}{$zone_name} }, $ns_string for $new_p->get_records_for_name( $query_type, $zone->name->string, q{answer} );
                     }
                     else {
                         push @{ $parent_found{$zone_name} }, $ns_string;