[Nagiosplug-checkins] SF.net SVN: nagiosplug:[2072] nagiosplug/trunk

[dermoth at users.sourceforge.net]

Revision: 2072
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2072&view=rev
Author:   dermoth
Date:     2008-11-05 21:36:43 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
Fix check_tcp longoptions handling

Modified Paths:
--------------
    nagiosplug/trunk/NEWS
    nagiosplug/trunk/plugins/check_tcp.c

Modified: nagiosplug/trunk/NEWS
===================================================================
--- nagiosplug/trunk/NEWS	2008-11-05 17:07:40 UTC (rev 2071)
+++ nagiosplug/trunk/NEWS	2008-11-05 21:36:43 UTC (rev 2072)
@@ -10,6 +10,7 @@
 	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)

Modified: nagiosplug/trunk/plugins/check_tcp.c
===================================================================
--- nagiosplug/trunk/plugins/check_tcp.c	2008-11-05 17:07:40 UTC (rev 2071)
+++ nagiosplug/trunk/plugins/check_tcp.c	2008-11-05 21:36:43 UTC (rev 2072)
@@ -395,10 +395,10 @@
 		{"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 @@
 		{"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}
 	};
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.