[pkg-nagios-changes] [Git][nagios-team/pkg-nagios-plugins-contrib][master] 2 commits: Update check_zone_auth to 1.14

[Jan Wagner]

Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / pkg-nagios-plugins-contrib


Commits:
713e713f by Jan Wagner at 2020-05-26T09:50:56+02:00
Update check_zone_auth to 1.14

- - - - -
3a81549a by Jan Wagner at 2020-05-26T09:53:57+02:00
Update check-multipath to 0.4.9

- - - - -


4 changed files:

- check_multipath/check-multipath.pl
- check_multipath/control
- check_zone_auth/check_zone_auth
- check_zone_auth/control


Changes:

=====================================
check_multipath/check-multipath.pl
=====================================
@@ -21,7 +21,7 @@
 #-------------------------------------------------------------
 #
 #
-# Copyright (C) 2011-2016
+# Copyright (C) 2011-2020
 # Hinnerk Rümenapf, Trond H. Amundsen, Gunther Schlegel, Matija Nalis, 
 # Bernd Zeimetz, Sven Anders, Ben Evans
 #
@@ -75,6 +75,7 @@
 #      0.4.6    Bugfix (output)
 #      0.4.7    Compatibility with CentOS/RHEL 5-7: no "switch", check second directory for multipath binary   (thanks to Christian Zettel) 25. Aug. 2016
 #      0.4.8    More characters allowed in LUN Name               (thanks to Ivan Zikyamov)  06. JAN 2020
+#      0.4.9    Bugfix in  --extraconfig  handling                (thanks to Jeffrey Honig <jeffrey.honig at xandr.com>)  24. MAR 2020
 #
 
 
@@ -99,7 +100,7 @@ use vars qw( $NAME $VERSION $AUTHOR $CONTACT $E_OK $E_WARNING $E_CRITICAL
 
 # === Version and similar info ===
 $NAME    = 'check-multipath.pl';
-$VERSION = '0.4.8   06. JAN 2020';
+$VERSION = '0.4.9   34. MAR 2020';
 $AUTHOR  = 'Hinnerk Rümenapf';
 $CONTACT = 'hinnerk [DOT] ruemenapf [AT] uni-hamburg [DOT] de   (hinnerk [DOT] ruemenapf [AT] gmx [DOT] de)';
 
@@ -919,7 +920,8 @@ if  ($opt{'print'} !~ m!^[GWND]+$!) {
 my @extraconfig = ();
 
 if ($opt{extraconfig} ne '') {
-    if ( $opt{extraconfig} !~ m/^([GWDN]!)?([\w\-]+,\d+,\d+(?:,(?:ok|warning|critical)(?:,\w+,\d+,\d+)*)?:)+$/ ) {
+   #if ( $opt{extraconfig} !~ m/^([GWDN]!)?([\w\-]+,\d+,\d+(?:,(?:ok|warning|critical)(?:,\w+,\d+,\d+)*)?:)+$/ ) {    # BUG fixed 2020-03-24 thanks to Jeffrey Honig <jeffrey.honig at xandr.com>
+    if ( $opt{extraconfig} !~ m/^(([GWDN]!)?[\w\-]+,\d+,\d+(?:,(?:ok|warning|critical)(?:,\w+,\d+,\d+)*)?:)+$/ ) {
 	unknown_error("Wrong usage of '--extraconfig' option: '"
 		      . $opt{extraconfig}
 		      . "' syntax error. See help information.");


=====================================
check_multipath/control
=====================================
@@ -1,5 +1,5 @@
 Watch: http://exchange.nagios.org/directory/Plugins/Operating-Systems/Linux/check-2Dmultipath-2Epl/details Current Version</div><div class="data">([0-9.]+)</div>
-Version: 0.4.8
+Version: 0.4.9
 Homepage: http://exchange.nagios.org/directory/Plugins/Operating-Systems/Linux/check-2Dmultipath-2Epl/details
 Uploaders: Bernd Zeimetz <bzed at debian.org>
 Description: plugin to monitor the number of available and


=====================================
check_zone_auth/check_zone_auth
=====================================
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: check_zone_auth,v 1.13 2010/07/23 15:54:08 wessels Exp $
+# $Id: check_zone_auth,v 1.14 2020/02/11 05:24:06 wessels Exp $
 #
 # check_zone_auth
 #
@@ -113,10 +113,10 @@ sub do_recursion {
 		print STDERR "\nRECURSE\n" if $opts{d};
 		my $pkt;
 		foreach my $ns (shuffle @refs) {
-			print STDERR "sending query for $zone SOA to $ns\n" if $opts{d};
+			print STDERR "sending query for $zone NS to $ns\n" if $opts{d};
 			$res->nameserver($ns);
 			$res->udp_timeout(5);
-			$pkt = $res->send($zone, 'SOA');
+			$pkt = $res->send($zone, 'NS');
 			last if $pkt;
 		}
 		critical("No response to seed query") unless $pkt;
@@ -124,12 +124,15 @@ sub do_recursion {
 			unless ($pkt->header->rcode eq 'NOERROR');
 		add_nslist_to_data($pkt);
 		@refs = ();
+		foreach my $rr ($pkt->answer) {
+			next unless ($rr->type eq 'NS');
+			next unless names_equal($rr->name, $zone);
+			$done = 1;
+		}
 		foreach my $rr ($pkt->authority) {
 			next unless ($rr->type eq 'NS');
 			print STDERR $rr->string, "\n" if $opts{d};
 			push (@refs, $rr->nsdname);
-			next unless names_equal($rr->name, $zone);
-			$done = 1;
 		}
 	} while (! $done);
 }
@@ -245,7 +248,7 @@ sub soa_serial {
 	my $pkt = shift;
 	foreach my $rr ($pkt->answer) {
 		next unless ($rr->type eq 'SOA');
-		next unless ($rr->name eq $zone);
+		next unless names_equal($rr->name, $zone);
 		return $rr->serial;
 	}
 	return 0;


=====================================
check_zone_auth/control
=====================================
@@ -4,4 +4,4 @@ Uploaders: Bernd Zeimetz <bzed at debian.org>
 Description: plugin to ensure that the authoritative nameservers
  for a given zone remain in sync.
 Recommends: libnet-dns-perl
-Version: 1.13
+Version: 1.14



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagios-plugins-contrib/-/compare/8c8a7701c1cebff6b4c095990a19a73d6c4c9596...3a81549a672525cf38a97c27e68c7d6adcaf10dc

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagios-plugins-contrib/-/compare/8c8a7701c1cebff6b4c095990a19a73d6c4c9596...3a81549a672525cf38a97c27e68c7d6adcaf10dc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20200526/fea2d236/attachment-0001.html>