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

lib/App/Netdisco.pm

@@ -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

lib/App/Netdisco/Util/DeviceAuth.pm

@@ -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