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-21 16:18:58 +00:00
parent 52e2751b50 764bbfe3fb
commit a872b7f5cc
5 changed files with 20 additions and 8 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.042002';
our $VERSION = '2.042003';
use App::Netdisco::Configuration;
=head1 NAME

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

@@ -34,7 +34,13 @@ config changes over time. Returns a list which can replace C<device_auth>.
=cut
sub fixup_device_auth {
my $config = (setting('device_auth') || setting('snmp_auth'));
my $da = dclone (setting('device_auth') || []);
my $sa = dclone (setting('snmp_auth') || []);
die "error: both snmp_auth and device_auth are defined! use only device_auth.\n"
if scalar @$da and scalar @$sa;
my $config = ((scalar @$da) ? $da : $sa);
my @new_stanzas = ();
# new style snmp config