diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 3efc2e625ad9aa12b8db68d013222506cd4c3798..f3a351e6800d82dd24b608705c76bc4501cf7936 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
int
main (int argc, char **argv)
{
+ int result;
if (process_arguments (argc, argv) == ERROR)
usage ("Could not parse arguments\n");
alarm (socket_timeout);
/* ssh_connect exits if error is found */
- ssh_connect (server_name, port);
+ result = ssh_connect (server_name, port);
alarm (0);
- return (STATE_OK);
+ return (result);
}
int c;
char *tmp = NULL;
-#ifdef HAVE_GETOPT_H
int option_index = 0;
static struct option long_options[] = {
{"version", no_argument, 0, 'V'},
{"host", required_argument, 0, 'H'},
{0, 0, 0, 0}
};
-#endif
if (argc < 2)
return ERROR;
strcpy (argv[c], "-t");
while (1) {
-#ifdef HAVE_GETOPT_H
c = getopt_long (argc, argv, "+Vhvt:H:p:", long_options, &option_index);
-#else
- c = getopt (argc, argv, "+Vhvt:H:p:");
-#endif
+
if (c == -1 || c == EOF)
break;
}
c = optind;
- if (server_name == NULL && argv[c]) {
+ if (server_name == NULL && c < argc) {
if (is_host (argv[c])) {
server_name = argv[c++];
}
}
- if (port == -1 && argv[c]) {
+ if (port == -1 && c < argc) {
if (is_intpos (argv[c])) {
port = atoi (argv[c++]);
}
ssh_server = ssh_proto + strspn (ssh_proto, "-0123456789. ");
ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0;
printf
- ("SSH ok - %s (protocol %s)\n",
+ ("SSH OK - %s (protocol %s)\n",
ssh_server, ssh_proto);
asprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, revision);
send (sd, buffer, strlen (buffer), MSG_DONTWAIT);