[Pkg-nagios-changes] [pkg-nagios] r1923 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

tags 623702 pending
thanks

Author: waja
Date: 2011-05-10 19:23:10 +0000 (Tue, 10 May 2011)
New Revision: 1923

Added:
   nagios-plugins/trunk/debian/patches/14_check_icmp_multiple_ips.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
fix for #623702

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2011-05-10 19:16:35 UTC (rev 1922)
+++ nagios-plugins/trunk/debian/changelog	2011-05-10 19:23:10 UTC (rev 1923)
@@ -5,6 +5,12 @@
     - Abort immediately if we don't receive a server greeting or if the
       greeting doesn't contain the "--expect"ed string (by default: "220")
       instead of blindly sending the EHLO/HELO line.
+  * Add 14_check_icmp_multiple_ips.dpatch (Closes: #623702), thanks Max Kosmach
+    for spotting and Sebastian Harl for providing a fix
+    - When specifying a host-name on the command line, each of its IPs is added
+      to the host table (and each one is pinged). So, the buffer has to be large
+      enough to hold all of the respective host objects. (argc - 1) only fits
+      hosts with a single IP.
   * Move libraries linked at compile time against checks of
     nagios-plugins-standard from Depends to Recommends (Closes: #569028)
     - Add slightly modified bin/gen_plugin_deps.pl from collectd source package

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2011-05-10 19:16:35 UTC (rev 1922)
+++ nagios-plugins/trunk/debian/patches/00list	2011-05-10 19:23:10 UTC (rev 1923)
@@ -6,3 +6,4 @@
 11_check_disk_smb_NT_STATUS_ACCESS_DENIED.dpatch
 12_check_snmp_1.4.15_regression.dpatch
 13_check_smtp_greeting.dpatch
+14_check_icmp_multiple_ips.dpatch

Added: nagios-plugins/trunk/debian/patches/14_check_icmp_multiple_ips.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/14_check_icmp_multiple_ips.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/14_check_icmp_multiple_ips.dpatch	2011-05-10 19:23:10 UTC (rev 1923)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14_check_icmp_multiple_ips.dpatch
+## Sebastian Harl <sh at teamix.net>
+##
+## From: 1374f80872412b64bd13f17e6edd70aa59437012 Mon Sep 17 00:00:00 2001
+## From: Sebastian Harl <sh at teamix.net>
+## Date: Thu, 28 Apr 2011 09:18:21 +0200
+## Subject: [PATCH] check_host: Allocate a large-enough buffer for the host table.
+## (Debian #623702)
+## X-Git-Url: http://nagiosplug.git.sourceforge.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commitdiff_plain;h=1374f80872412b64bd13f17e6edd70aa59437012
+##
+## DP: Allocate a large-enough buffer for the host table. (http://bugs.debian.org/623702)
+
+ at DPATCH@
+
+--- a/plugins-root/check_icmp.c
++++ b/plugins-root/check_icmp.c
+@@ -621,7 +621,7 @@ main(int argc, char **argv)
+ 	}
+ 
+ 	host = list;
+-	table = malloc(sizeof(struct rta_host **) * (argc - 1));
++	table = malloc(sizeof(struct rta_host **) * targets);
+ 	i = 0;
+ 	while(host) {
+ 		host->id = i*packets;
+