Verbose should not have to exceed 3 as per developement guidelines

[nagiosplug.git] / plugins / check_ssh.c

diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 5617addc66baded12d9ead64636878626471b551..4b5f6b763f9585490dbd88dbf0d927ff23ce72eb 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -1,26 +1,39 @@
-/******************************************************************************
-
- 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
- (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.
-
- $Id$
- 
-******************************************************************************/
+/*****************************************************************************
+* 
+* Nagios check_ssh plugin
+* 
+* License: GPL
+* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* 
+* Last Modified: $Date$
+* 
+* Description:
+* 
+* This file contains the check_ssh plugin
+* 
+* Try to connect to an SSH server at specified server and port
+* 
+* 
+* 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 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, see <http://www.gnu.org/licenses/>.
+* 
+* $Id$
+* 
+*****************************************************************************/
 
 const char *progname = "check_ssh";
 const char *revision = "$Revision$";
-const char *copyright = "2000-2004";
+const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -57,6 +70,9 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
+
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
@@ -85,7 +101,8 @@ process_arguments (int argc, char **argv)
        static struct option longopts[] = {
                {"help", no_argument, 0, 'h'},
                {"version", no_argument, 0, 'V'},
-               {"host", required_argument, 0, 'H'},
+               {"host", required_argument, 0, 'H'},    /* backward compatibility */
+               {"hostname", required_argument, 0, 'H'},
                {"port", required_argument, 0, 'p'},
                {"use-ipv4", no_argument, 0, '4'},
                {"use-ipv6", no_argument, 0, '6'},
@@ -110,7 +127,7 @@ process_arguments (int argc, char **argv)
 
                switch (c) {
                case '?':                                                                       /* help */
-                       usage2 (_("Unknown argument"), optarg);
+                       usage5 ();
                case 'V':                                                                       /* version */
                        print_revision (progname, revision);
                        exit (STATE_OK);
@@ -215,6 +232,7 @@ ssh_connect (char *haddr, int hport, char *remote_version)
        recv (sd, output, BUFF_SZ, 0);
        if (strncmp (output, "SSH", 3)) {
                printf (_("Server answer: %s"), output);
+               close(sd);
                exit (STATE_CRITICAL);
        }
        else {
@@ -234,6 +252,7 @@ ssh_connect (char *haddr, int hport, char *remote_version)
                        printf
                                (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
                                 ssh_server, ssh_proto, remote_version);
+                       close(sd);
                        exit (STATE_WARNING);
                }
                
@@ -258,11 +277,14 @@ print_help (void)
        printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n");
        printf (COPYRIGHT, copyright, email);
 
-       printf (_("Try to connect to an SSH server at specified server and port\n\n"));
+       printf ("%s\n", _("Try to connect to an SSH server at specified server and port"));
+
+  printf ("\n\n");
 
        print_usage ();
 
        printf (_(UT_HELP_VRSN));
+       printf (_(UT_EXTRA_OPTS));
 
        printf (_(UT_HOST_PORT), 'p', myport);
 
@@ -270,12 +292,17 @@ print_help (void)
 
        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
 
-       printf (_("\
- -r, --remote-version=STRING\n\
-    Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)\n"));
+       printf (" %s\n", "-r, --remote-version=STRING");
+  printf ("    %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
        
        printf (_(UT_VERBOSE));
 
+#ifdef NP_EXTRA_OPTS
+       printf ("\n");
+       printf ("%s\n", _("Notes:"));
+       printf (_(UT_EXTRA_OPTS_NOTES));
+#endif
+
        printf (_(UT_SUPPORT));
 }
 
@@ -284,7 +311,7 @@ print_help (void)
 void
 print_usage (void)
 {
-       printf ("\
-Usage: %s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
+  printf (_("Usage:"));
+       printf ("%s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
 }