From 9eaef17680bc7125fe879349e04ca05e76aaf9cb Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 21 Jul 2021 09:51:00 +0100 Subject: [PATCH] Revert "#767 also respect dns->no configuration in ip_from_hostname()" This reverts commit 74b9583fae03d41ed1eb6cbefc608d3b11d11f5a. --- Changes | 1 - lib/App/Netdisco/Util/DNS.pm | 7 ------- 2 files changed, 8 deletions(-) diff --git a/Changes b/Changes index 7d519c7d..41ace9a6 100644 --- a/Changes +++ b/Changes @@ -16,7 +16,6 @@ * #784 empty device_skip table when also emptying job queue * #788 use device.name instead of device.dns for pseudo devices * #783 fix FQDN discovery in node monitor emails - * #767 also respect dns->no configuration in ip_from_hostname() 2.047005 - 2021-02-24 diff --git a/lib/App/Netdisco/Util/DNS.pm b/lib/App/Netdisco/Util/DNS.pm index 1b8e0e6a..978592b5 100644 --- a/lib/App/Netdisco/Util/DNS.pm +++ b/lib/App/Netdisco/Util/DNS.pm @@ -7,8 +7,6 @@ use Dancer ':script'; use Net::DNS; use NetAddr::IP::Lite ':lower'; -use App::Netdisco::Util::Permission 'check_acl_no'; - use base 'Exporter'; our @EXPORT = (); our @EXPORT_OK = qw/hostname_from_ip ipv4_from_hostname/; @@ -31,8 +29,6 @@ subroutines. Given an IP address (either IPv4 or IPv6), return the canonical hostname. -Will respect the excluded IPs in L configuration. - C<< %opts >> can override the various timeouts available in L: @@ -55,11 +51,8 @@ Returns C if no PTR record exists for the IP. sub hostname_from_ip { my ($ip, $opts) = @_; return unless $ip; - my $skip = setting('dns')->{'no'}; my $ETCHOSTS = setting('dns')->{'ETCHOSTS'}; - return if check_acl_no($ip, $skip); - # check /etc/hosts file and short-circuit if found foreach my $name (reverse sort keys %$ETCHOSTS) { if ($ETCHOSTS->{$name}->[0]->[0] eq $ip) {