X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fcheck_ssh.c;h=9a1934383111ff5b5b738d82bb7731b8af546dc6;hb=25d1ee331dbe4977a4a1a756c67f32bd51d9b070;hp=ce4c08482f1b47cab0452ce686a8e6f21e6a0353;hpb=d8ecf6bfc264717c611a983fe8ccb0488669791a;p=nagiosplug.git

diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index ce4c084..9a19343 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -1,43 +1,35 @@
-/******************************************************************************
-*
+/*****************************************************************************
+* 
 * Nagios check_ssh plugin
-*
+* 
 * License: GPL
-* Copyright (c) 1999-2006 nagios-plugins team
-*
-* Last Modified: $Date$
-*
+* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* 
 * Description:
-*
+* 
 * This file contains the check_ssh plugin
-*
-*
-*  Try to connect to an SSH server at specified server and port
-*
-*
-* License Information:
-*
-* This program is free software; you can redistribute it and/or modify
+* 
+* 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 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.
-*
-* $Id$
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-******************************************************************************/
+* 
+*****************************************************************************/
 
 const char *progname = "check_ssh";
-const char *revision = "$Revision$";
-const char *copyright = "2000-2006";
+const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -74,12 +66,15 @@ 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"));
 
 	/* initialize alarm signal handling */
 	signal (SIGALRM, socket_timeout_alarm_handler);
-	
+
 	alarm (socket_timeout);
 
 	/* ssh_connect exits if error is found */
@@ -102,7 +97,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'},
@@ -127,9 +123,9 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* help */
-			usage2 (_("Unknown argument"), optarg);
+			usage5 ();
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -218,9 +214,7 @@ ssh_connect (char *haddr, int hport, char *remote_version)
 	char *buffer = NULL;
 	char *ssh_proto = NULL;
 	char *ssh_server = NULL;
-	char rev_no[20];
-
-	sscanf ("$Revision$", "$Revision: %[0123456789.]", rev_no);
+	static char *rev_no = VERSION;
 
 	result = my_tcp_connect (haddr, hport, &sd);
 
@@ -232,6 +226,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 {
@@ -251,9 +246,10 @@ 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);
 		}
-		
+
 		printf
 			(_("SSH OK - %s (protocol %s)\n"),
 			 ssh_server, ssh_proto);
@@ -270,7 +266,7 @@ print_help (void)
 	char *myport;
 	asprintf (&myport, "%d", SSH_DFL_PORT);
 
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n");
 	printf (COPYRIGHT, copyright, email);
@@ -281,20 +277,27 @@ print_help (void)
 
 	print_usage ();
 
-	printf (_(UT_HELP_VRSN));
+	printf (UT_HELP_VRSN);
+	printf (UT_EXTRA_OPTS);
 
-	printf (_(UT_HOST_PORT), 'p', myport);
+	printf (UT_HOST_PORT, 'p', myport);
 
-	printf (_(UT_IPv46));
+	printf (UT_IPv46);
 
-	printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+	printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
 	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));
 
-	printf (_(UT_SUPPORT));
+	printf (UT_VERBOSE);
+
+#ifdef NP_EXTRA_OPTS
+	printf ("\n");
+	printf ("%s\n", _("Notes:"));
+	printf (UT_EXTRA_OPTS_NOTES);
+#endif
+
+	printf (UT_SUPPORT);
 }