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

6
Changes
View File

@@ -1,3 +1,9 @@
2.042003 - 2019-03-21
[BUG FIXES]
* minor enhancement to the way device_auth falls back to snmp_auth
2.042002 - 2019-03-20 2.042002 - 2019-03-20
[ENHANCEMENTS] [ENHANCEMENTS]

6
META.json
View File

@@ -120,7 +120,7 @@
"provides" : { "provides" : {
"App::Netdisco" : { "App::Netdisco" : {
"file" : "lib/App/Netdisco.pm", "file" : "lib/App/Netdisco.pm",
"version" : "2.042002" "version" : "2.042003"
}, },
"App::Netdisco::AnyEvent::Nbtstat" : { "App::Netdisco::AnyEvent::Nbtstat" : {
"file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm" "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -806,7 +806,7 @@
}, },
"homepage" : "http://netdisco.org/", "homepage" : "http://netdisco.org/",
"license" : [ "license" : [
"http://opensource.org/licenses/BSD-3-Clause" "http://opensource.org/licenses/bsd-license.php"
], ],
"repository" : { "repository" : {
"url" : "https://github.com/netdisco/netdisco" "url" : "https://github.com/netdisco/netdisco"
@@ -814,6 +814,6 @@
"x_IRC" : "irc://irc.freenode.org/#netdisco", "x_IRC" : "irc://irc.freenode.org/#netdisco",
"x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users" "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
}, },
"version" : "2.042002", "version" : "2.042003",
"x_serialization_backend" : "JSON::PP version 2.97001" "x_serialization_backend" : "JSON::PP version 2.97001"
} }

6
META.yml
View File

@@ -23,7 +23,7 @@ name: App-Netdisco
provides: provides:
App::Netdisco: App::Netdisco:
file: lib/App/Netdisco.pm file: lib/App/Netdisco.pm
version: '2.042002' version: '2.042003'
App::Netdisco::AnyEvent::Nbtstat: App::Netdisco::AnyEvent::Nbtstat:
file: lib/App/Netdisco/AnyEvent/Nbtstat.pm file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
App::Netdisco::Backend::Job: App::Netdisco::Backend::Job:
@@ -557,7 +557,7 @@ resources:
MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users
bugtracker: https://github.com/netdisco/netdisco/issues bugtracker: https://github.com/netdisco/netdisco/issues
homepage: http://netdisco.org/ homepage: http://netdisco.org/
license: http://opensource.org/licenses/BSD-3-Clause license: http://opensource.org/licenses/bsd-license.php
repository: https://github.com/netdisco/netdisco repository: https://github.com/netdisco/netdisco
version: '2.042002' version: '2.042003'
x_serialization_backend: 'CPAN::Meta::YAML version 0.018' x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

2
lib/App/Netdisco.pm
View File

@@ -4,7 +4,7 @@ use strict;
use warnings; use warnings;
use 5.010_000; use 5.010_000;
our $VERSION = '2.042002'; our $VERSION = '2.042003';
use App::Netdisco::Configuration; use App::Netdisco::Configuration;
=head1 NAME =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 =cut
sub fixup_device_auth { 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 = (); my @new_stanzas = ();
# new style snmp config # new style snmp config