check_tcp code cleanup from andreas plus fix to andreas' patch from sean

[nagiosplug.git] / plugins / check_ssh.c

diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index a21e2f524cbbbb33c63d39f4cd75e96034a9857a..5617addc66baded12d9ead64636878626471b551 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -57,7 +57,7 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */
@@ -110,9 +110,7 @@ process_arguments (int argc, char **argv)
 
                switch (c) {
                case '?':                                                                       /* help */
-                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-                       print_usage ();
-                       exit (STATE_UNKNOWN);
+                       usage2 (_("Unknown argument"), optarg);
                case 'V':                                                                       /* version */
                        print_revision (progname, revision);
                        exit (STATE_OK);
@@ -135,7 +133,7 @@ process_arguments (int argc, char **argv)
 #ifdef USE_IPV6
                        address_family = AF_INET6;
 #else
-                       usage (_("IPv6 support not available\n"));
+                       usage4 (_("IPv6 support not available"));
 #endif
                        break;
                case 'r':                                                                       /* remote version */
@@ -151,11 +149,9 @@ process_arguments (int argc, char **argv)
                                port = atoi (optarg);
                        }
                        else {
-                               printf ("Port number nust be a positive integer: %s\n", optarg);
-                               usage ("");
+                               usage2 (_("Port number must be a positive integer"), optarg);
                        }
                }
-
        }
 
        c = optind;
@@ -244,6 +240,7 @@ ssh_connect (char *haddr, int hport, char *remote_version)
                printf
                        (_("SSH OK - %s (protocol %s)\n"),
                         ssh_server, ssh_proto);
+               close(sd);
                exit (STATE_OK);
        }
 }
@@ -288,8 +285,6 @@ void
 print_usage (void)
 {
        printf ("\
-Usage: %s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n"), progname);
-
-       printf (UT_HLP_VRS, progname, progname);
+Usage: %s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
 }