135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into og-api-tokens-simple

Browse Source
This commit is contained in:
Oliver Gorwits
2019-03-17 20:32:21 +00:00
parent 33f94eac62 0ae705c6a8
commit a2168cc6e2
8 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco.pm
View File

@@ -4,7 +4,7 @@ use strict;
use warnings;
use 5.010_000;
our $VERSION = '2.041001';
our $VERSION = '2.042000';
use App::Netdisco::Configuration;
=head1 NAME

2
lib/App/Netdisco/Util/DeviceAuth.pm
View File

@@ -33,7 +33,7 @@ config changes over time. Returns a list which can replace C<device_auth>.
=cut
sub fixup_device_auth {
my $config = (setting('snmp_auth') || setting('device_auth'));
my $config = (setting('device_auth') || setting('snmp_auth'));
my @new_stanzas = ();
# new style snmp config

3
lib/App/Netdisco/Util/Nbtstat.pm
View File

@@ -42,7 +42,8 @@ service status for addresses which responded.
sub nbtstat_resolve_async {
my $ips = shift;
my $timeout = setting('nbtstat_response_timeout') || 1;
my $timeout = (setting('nbtstat_response_timeout')
|| setting('nbtstat_timeout') || 1);
my $interval = setting('nbtstat_interval') || 0.02;
my $stater = App::Netdisco::AnyEvent::Nbtstat->new(