Merge branch 'master' into og-newnetmap

2017-12-31 08:59:19 +00:00
parent 66e353669d 07446ed7d6
commit 85d52ed174
7 changed files with 17 additions and 12 deletions
--- a/lib/App/Netdisco/Util/SNMP.pm
+++ b/lib/App/Netdisco/Util/SNMP.pm
@@ -32,7 +32,7 @@ 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 $config = (setting('snmp_auth') || setting('device_auth'));
  my @new_stanzas = ();

  # new style snmp config