check_snmp: Fix regression introduced in #1867716

[nagiosplug.git] / plugins / check_tcp.c

diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index e502c0d1e52eacbe2f021478413a4602e8ef045d..b094207e9202c29c20abdf963e1dd864761ebc70 100644 (file)
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -1,31 +1,27 @@
 /*****************************************************************************
-*
+* 
 * Nagios check_tcp plugin
-*
+* 
 * License: GPL
-* Copyright (c) 1999-2006 nagios-plugins team
-*
-* Last Modified: $Date$
-*
+* Copyright (c) 1999-2008 Nagios Plugins Development Team
+* 
 * Description:
-*
+* 
 * This file contains the check_tcp plugin
-*
-* License Information:
-*
-* This program is free software; you can redistribute it and/or modify
+* 
+* 
+* This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
+* the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-*
+* 
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-*
+* 
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 * $Id$
 * 
@@ -33,8 +29,7 @@
 
 /* progname "check_tcp" changes depending on symlink called */
 char *progname;
-const char *revision = "$Revision$";
-const char *copyright = "1999-2006";
+const char *copyright = "1999-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -207,6 +202,9 @@ main (int argc, char **argv)
        server_quit = QUIT;
        status = NULL;
 
+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
+
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
@@ -314,7 +312,7 @@ main (int argc, char **argv)
        }
 #ifdef HAVE_SSL
        np_net_ssl_cleanup();
-#endif 
+#endif
        if (sd) close (sd);
 
        microsec = deltime (tv);
@@ -394,10 +392,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'},
@@ -411,10 +409,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}
        };
 
@@ -452,7 +448,7 @@ process_arguments (int argc, char **argv)
                        print_help ();
                        exit (STATE_OK);
                case 'V':                 /* version */
-                       print_revision (progname, revision);
+                       print_revision (progname, NP_VERSION);
                        exit (STATE_OK);
                case 'v':                 /* verbose mode */
                        flags |= FLAG_VERBOSE;
@@ -593,7 +589,7 @@ process_arguments (int argc, char **argv)
 void
 print_help (void)
 {
-       print_revision (progname, revision);
+       print_revision (progname, NP_VERSION);
 
        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
        printf (COPYRIGHT, copyright, email);
@@ -604,6 +600,7 @@ print_help (void)
        print_usage ();
 
        printf (_(UT_HELP_VRSN));
+       printf (_(UT_EXTRA_OPTS));
 
        printf (_(UT_HOST_PORT), 'p', "none");
 
@@ -621,7 +618,7 @@ print_help (void)
   printf (" %s\n", "-q, --quit=STRING");
   printf ("    %s\n", _("String to send server to initiate a clean close of the connection"));
   printf (" %s\n", "-r, --refuse=ok|warn|crit");
-  printf ("    %s\n", _("Accept tcp refusals with states ok, warn, crit (default: crit)"));
+  printf ("    %s\n", _("Accept TCP refusals with states ok, warn, crit (default: crit)"));
   printf (" %s\n", "-M, --mismatch=ok|warn|crit");
   printf ("    %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)"));
   printf (" %s\n", "-j, --jail");
@@ -644,6 +641,12 @@ print_help (void)
 
        printf (_(UT_VERBOSE));
 
+#ifdef NP_EXTRA_OPTS
+       printf ("\n");
+       printf ("%s\n", _("Notes:"));
+       printf (_(UT_EXTRA_OPTS_NOTES));
+#endif
+
        printf (_(UT_SUPPORT));
 }