From 9bc7a29908321902f0a7fbdb8c7fbc33b058fc2f Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 10 Dec 2013 23:03:01 +0100 Subject: [PATCH] Add 11_check_http_arguments.dpatch to fix argument processing of check_http --- debian/patches/00list | 1 + debian/patches/11_check_http_arguments.dpatch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 debian/patches/11_check_http_arguments.dpatch diff --git a/debian/patches/00list b/debian/patches/00list index 35b85ec..a44ef87 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1,3 @@ 02_check_icmp_links.dpatch # commited upstream +11_check_http_arguments.dpatch diff --git a/debian/patches/11_check_http_arguments.dpatch b/debian/patches/11_check_http_arguments.dpatch new file mode 100644 index 0000000..e8bb243 --- /dev/null +++ b/debian/patches/11_check_http_arguments.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_check_http_arguments.dpatch by Jan Wagner +## +## From c91ff7539af65f95c2bcef69e5643bd99773c80f Mon Sep 17 00:00:00 2001 +## From: Holger Weiss +## Date: Thu, 5 Dec 2013 20:13:31 +0100 +## Subject: [PATCH] check_http: Don't let "-N" expect an argument +## +## Fix the problem that check_http's "-N" option expects an argument +## although it shouldn't. The corresponding long option ("--no-body") +## wasn't affected. +## +## This error was introduced in ee3c4014d511e105489b081390636cacd4c53e3f. +## Thanks to Kerry Hughes for reporting it on the devel@ list. + +@DPATCH@ + +diff --git a/plugins/check_http.c b/plugins/check_http.c +index 0ffb0c1..1595a59 100644 +--- a/plugins/check_http.c ++++ b/plugins/check_http.c +@@ -257,7 +257,7 @@ enum { + } + + while (1) { +- c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:N:E", longopts, &option); ++ c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:NE", longopts, &option); + if (c == -1 || c == EOF) + break; + +-- +1.8.5.1 +