![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 6e0b0f17aef9c0c9debabe11355ff9fc52cdcdba..a21e2f524cbbbb33c63d39f4cd75e96034a9857a 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ $Id$
+
******************************************************************************/
-#include "common.h"
-#include "netutils.h"
-#include "utils.h"
-
const char *progname = "check_ssh";
const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
+#include "common.h"
+#include "netutils.h"
+#include "utils.h"
+
#ifndef MSG_DONTWAIT
#define MSG_DONTWAIT 0
#endif
int port = -1;
char *server_name = NULL;
+char *remote_version = NULL;
int verbose = FALSE;
int process_arguments (int, char **);
void print_help (void);
void print_usage (void);
-int ssh_connect (char *haddr, int hport);
+int ssh_connect (char *haddr, int hport, char *remote_version);
+
+
int
main (int argc, char **argv)
{
- int result;
+ int result = STATE_UNKNOWN;
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) == ERROR)
- usage (_("Could not parse arguments\n"));
+ if (process_arguments (argc, argv) != TRUE)
+ 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 */
- result = ssh_connect (server_name, port);
+ result = ssh_connect (server_name, port, remote_version);
alarm (0);
}
+
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
{"use-ipv6", no_argument, 0, '6'},
{"timeout", required_argument, 0, 't'},
{"verbose", no_argument, 0, 'v'},
+ {"remote-version", required_argument, 0, 'r'},
{0, 0, 0, 0}
};
strcpy (argv[c], "-t");
while (1) {
- c = getopt_long (argc, argv, "+Vhv46t:H:p:", longopts, &option);
+ c = getopt_long (argc, argv, "+Vhv46t:r:H:p:", longopts, &option);
if (c == -1 || c == EOF)
break;
switch (c) {
case '?': /* help */
- usage ("");
+ printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
+ print_usage ();
+ exit (STATE_UNKNOWN);
case 'V': /* version */
print_revision (progname, revision);
exit (STATE_OK);
case 'h': /* help */
print_help ();
exit (STATE_OK);
- case 'v': /* verose */
+ case 'v': /* verbose */
verbose = TRUE;
break;
case 't': /* timeout period */
usage (_("IPv6 support not available\n"));
#endif
break;
+ case 'r': /* remote version */
+ remote_version = optarg;
+ break;
case 'H': /* host */
if (is_host (optarg) == FALSE)
- usage2 (_("Invalid host name/address"), optarg);
+ usage2 (_("Invalid hostname/address"), optarg);
server_name = optarg;
break;
case 'p': /* port */
*
*-----------------------------------------------------------------------*/
+
int
-ssh_connect (char *haddr, int hport)
+ssh_connect (char *haddr, int hport, char *remote_version)
{
int sd;
int result;
ssh_proto = output + 4;
ssh_server = ssh_proto + strspn (ssh_proto, "-0123456789. ");
ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0;
- printf
- (_("SSH OK - %s (protocol %s)\n"),
- ssh_server, ssh_proto);
+
asprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, rev_no);
send (sd, buffer, strlen (buffer), MSG_DONTWAIT);
if (verbose)
printf ("%s\n", buffer);
+
+ if (remote_version && strcmp(remote_version, ssh_server)) {
+ printf
+ (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
+ ssh_server, ssh_proto, remote_version);
+ exit (STATE_WARNING);
+ }
+
+ printf
+ (_("SSH OK - %s (protocol %s)\n"),
+ ssh_server, ssh_proto);
exit (STATE_OK);
}
}
+
+
void
print_help (void)
{
printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n");
printf (COPYRIGHT, copyright, email);
- printf (_("Try to connect to SSH server at specified server and port\n\n"));
+ printf (_("Try to connect to an SSH server at specified server and port\n\n"));
print_usage ();
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 (_(UT_VERBOSE));
printf (_(UT_SUPPORT));
}
+
+
void
print_usage (void)
{
- printf (_("\
-Usage: %s [-46] [-t <timeout>] [-p <port>] <host>\n"), progname);
- printf (_(UT_HLP_VRS), progname, progname);
+ printf ("\
+Usage: %s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n"), progname);
+
+ printf (UT_HLP_VRS, progname, progname);
}
-/* end of check_ssh.c */