changed handling of overrides
authorheiko
Mon, 19 Jan 2015 12:02:05 +0100
changeset 26 d465c78373ca
parent 25 88749a69668e
child 27 beeac1cf82ed
changed handling of overrides No the overrides are considered to be our reference source
lib/Nagios/Check/DNS/delegation.pm
t/10-minimal.t
--- a/lib/Nagios/Check/DNS/delegation.pm	Mon Jan 19 12:01:39 2015 +0100
+++ b/lib/Nagios/Check/DNS/delegation.pm	Mon Jan 19 12:02:05 2015 +0100
@@ -89,12 +89,9 @@
     ### assert: @_ % 2 == 0
     my %resflags = (nameservers => \@extns, @_);
     my $aa = delete $resflags{aa};
-    my $override = delete $resflags{override};
     my $nameservers = join ',' => @{$resflags{nameservers}};
     my @ns;
 
-    return sort @{$override->{$domain}} if exists $override->{$domain};
-
     my $r = Net::DNS::Resolver->new(%resflags);
     my $q;
 
@@ -141,7 +138,6 @@
 
     my (@errs, @ns);
     # obtain an authoritive list of nameservers from the reference server
-    #my @our = eval { sort +ns($domain, nameservers => [$reference], aa => 1, override => $override) };
     my @our = eval { sort +ns($domain, nameservers => $references, aa => 1) };
     if (chomp $@) {
         push @errs, $@;
--- a/t/10-minimal.t	Mon Jan 19 12:01:39 2015 +0100
+++ b/t/10-minimal.t	Mon Jan 19 12:02:05 2015 +0100
@@ -66,12 +66,6 @@
 };
 
 
-my %override = (
-    'example.com' => [qw(ns1.foobar.de ns2.foobar.com)],
-);
-
-is_deeply [ns('example.com', nameservers => [qw/127.0.0.1/], override => \%override)],
-    $override{'example.com'} => 'override';
 
 for (qw(heise.de schlittermann.de google.com debian.org example.org)) {
 
@@ -94,9 +88,9 @@
 throws_ok { ns('safasdfasdfrandomadsfefvddeas') }
 qr/^NXDOMAIN/ => 'throws on nx domain';
 
-ok ns_ok('schlittermann.de', '212.80.235.130') => 'ns_ok for schlittermann.de';
-throws_ok { ns_ok('heise.de', '212.80.235.130') } qr/no aa|differ|REFUSED/ => 'ns_ok for heise.de';
-throws_ok { ns_ok('heise.de', '8.8.8.8') } qr/no aa|differ|REFUSED/ => 'ns_ok for heise.de';
+ok ns_ok('schlittermann.de', ['212.80.235.130']) => 'ns_ok for schlittermann.de';
+throws_ok { ns_ok('heise.de', ['212.80.235.130']) } qr/no aa|differ|REFUSED/ => 'ns_ok for heise.de';
+throws_ok { ns_ok('heise.de', ['8.8.8.8']) } qr/no aa|differ|REFUSED/ => 'ns_ok for heise.de';
 
 # serial