diff options
-rw-r--r-- | Makefile.PL | 2 | ||||
-rwxr-xr-x | acmeman | 34 |
2 files changed, 5 insertions, 31 deletions
diff --git a/Makefile.PL b/Makefile.PL index 53ed39a..1fad0ba 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -31,7 +31,7 @@ my %makefile_args = ( 'Pod::Man' => 2.25, 'Text::ParseWords' => 3.27, 'Data::Dumper' => 0, - 'Net::DNS' => 0.68, + 'Socket' => 0, 'Sys::Hostname' => 1.16 }, @@ -29,7 +29,7 @@ use File::Path qw(make_path); use DateTime::Format::Strptime; use LWP::UserAgent; use LWP::Protocol::https; -use Net::DNS; +use Socket qw(inet_ntoa); use Sys::Hostname; use Pod::Usage; use Pod::Man; @@ -934,39 +934,13 @@ sub coalesce { sub resolve { my $host = shift; - state $res; - unless ($res) { - $res = new Net::DNS::Resolver(); - } - my $q = $res->query($host,'ANY'); - unless ($q) { - if ($res->errorstring eq 'NXDOMAIN') { - debug(1, "$host: no such host"); - } elsif ($res->errorstring eq 'NOERROR') { - debug(1, "$host: no A record"); + if (my @addrs = gethostbyname($host)) { + return map { inet_ntoa($_) } @addrs[4 .. $#addrs]; } else { - error("$host: " . $res->errorstring); - # FIXME: bail out? + error("$host doesn't resolve"); } return (); } - my %res; - my %cnames; - my @answer = $q->answer(); - while (my $ans = shift @answer) { - if ($ans->type eq 'A') { - $res{$ans->rdatastr} = 1; - } elsif ($ans->type eq 'CNAME') { - unless ($cnames{$ans->cname}) { # Avoid eventual loops - $cnames{$ans->cname} = 1; - if (my $q = $res->query($ans->cname, 'A')) { - push @answer, ($q->answer()); - } - } - } - } - keys %res; -} sub myip { my $host = shift; |