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 7c630c5979a34404fcfd044591c22f16fcb72303..2686cd8557383092fbd02a53440500cd6b9a56d4 100644 (file)
--- 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 3ad31318fb8ba835ea592339e9601e92029ba86b..f5ef7818e6316998d42f892299f428d712450a9f 100644 (file)
--- 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}
        };