properly call close() on the ssh connection before exiting.

[nagiosplug.git] / plugins / check_ssh.c

diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 46dd044d11ff5f204252c449cf0e8c89da11677f..5617addc66baded12d9ead64636878626471b551 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -18,15 +18,15 @@
  
 ******************************************************************************/
 
-#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
@@ -51,17 +51,18 @@ 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) != OK)
-               usage (_("check_ssh: could not parse arguments\n"));
+       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 */
@@ -109,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);
@@ -134,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 */
@@ -150,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;
@@ -243,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);
        }
 }
@@ -286,9 +284,7 @@ print_help (void)
 void
 print_usage (void)
 {
-       printf (_("\
-Usage: %s [-46] [-t <timeout>] [-r <remote version>] [-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);
 }
 
-/* end of check_ssh.c */