From: Thomas Guyot-Sionnest <dermoth@users.sourceforge.net>
Date: Wed, 5 Nov 2008 21:36:43 +0000 (+0000)
Subject: Fix check_tcp longoptions handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dac9d73736570d175ce40a0cc5151e6b0ee3d3d0;p=nagiosplug.git

Fix check_tcp longoptions handling


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2072 f882894a-f735-0410-b71e-b25c423dba1c
---

diff --git a/NEWS b/NEWS
index 7c630c5..2686cd8 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ This file documents the major additions and syntax changes between releases.
 	Extra-opts (C plugins) does not allow trailing comments anymore (like N::P)
 	Fixed dependency issue on libtap when ./configure --enable-libtap used. Warning: will install libtap
 	Fixed segfault in extra-opts under some circumstance when reading multiple sections
+	Fix long options parsing in check_tcp
 
 1.4.13 25th Sept 2008
 	Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 3ad3131..f5ef781 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -395,10 +395,10 @@ process_arguments (int argc, char **argv)
 		{"critical-codes", required_argument, 0, 'C'},
 		{"warning-codes", required_argument, 0, 'W'},
 		{"timeout", required_argument, 0, 't'},
-		{"protocol", required_argument, 0, 'P'},
+		{"protocol", required_argument, 0, 'P'}, /* FIXME: Unhandled */
 		{"port", required_argument, 0, 'p'},
-		{"escape", required_argument, 0, 'E'},
-		{"all", required_argument, 0, 'A'},
+		{"escape", no_argument, 0, 'E'},
+		{"all", no_argument, 0, 'A'},
 		{"send", required_argument, 0, 's'},
 		{"expect", required_argument, 0, 'e'},
 		{"maxbytes", required_argument, 0, 'm'},
@@ -412,10 +412,8 @@ process_arguments (int argc, char **argv)
 		{"verbose", no_argument, 0, 'v'},
 		{"version", no_argument, 0, 'V'},
 		{"help", no_argument, 0, 'h'},
-#ifdef HAVE_SSL
 		{"ssl", no_argument, 0, 'S'},
 		{"certificate", required_argument, 0, 'D'},
-#endif
 		{0, 0, 0, 0}
 	};