[Pkg-nagios-changes] [pkg-nagios-plugins] 272/413: fix for #623702

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit a48887cae52f2244d697739049687fa6fd2dff1a
Author: Jan Wagner <waja at cyconet.org>
Date:   Tue May 10 19:23:10 2011 +0000

    fix for #623702
---
 debian/changelog                                 |  6 ++++++
 debian/patches/00list                            |  1 +
 debian/patches/14_check_icmp_multiple_ips.dpatch | 27 ++++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 262d67c..1a40308 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ nagios-plugins (1.4.15-4) UNRELEASED; urgency=low
     - 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
diff --git a/debian/patches/00list b/debian/patches/00list
index cfc0b18..3828a04 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -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
diff --git a/debian/patches/14_check_icmp_multiple_ips.dpatch b/debian/patches/14_check_icmp_multiple_ips.dpatch
new file mode 100644
index 0000000..d189f21
--- /dev/null
+++ b/debian/patches/14_check_icmp_multiple_ips.dpatch
@@ -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;
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git