X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_by_ssh.c;h=866044bd3b9e62975e538c908a5d149d77f19110;hb=831d03cd768cb4d1f96d3cabd6262a0a55f904e7;hp=93f1ead53173db1d348db022c74b393f0de4d276;hpb=6fa04c4a4954c34bd212a0f383fd1337d29a6cde;p=nagiosplug.git

diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 93f1ead..866044b 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -22,7 +22,7 @@
  *
  *****************************************************************************/
  
-#define PROGRAM check_by_ssh
+const char *progname = "check_by_ssh";
 #define DESCRIPTION "Run checks on a remote system using ssh, wrapping the proper timeout around the ssh invocation."
 #define AUTHOR "Karl DeBisschop"
 #define EMAIL "karl@debisschop.net"
@@ -34,11 +34,9 @@
 #include "utils.h"
 #include <time.h>
 
-#define PROGNAME "check_by_ssh"
-
 int process_arguments (int, char **);
 int validate_arguments (void);
-void print_help (char *command_name);
+void print_help (const char *command_name);
 void print_usage (void);
 
 
@@ -176,7 +174,6 @@ process_arguments (int argc, char **argv)
 	char *p1, *p2;
 	size_t len;
 
-#ifdef HAVE_GETOPT_H
 	int option_index = 0;
 	static struct option long_options[] = {
 		{"version", no_argument, 0, 'V'},
@@ -197,7 +194,6 @@ process_arguments (int argc, char **argv)
 		{"use-ipv6", no_argument, 0, '6'},
 		{0, 0, 0, 0}
 	};
-#endif
 
 	if (argc < 2)
 		return ERROR;
@@ -207,13 +203,8 @@ process_arguments (int argc, char **argv)
 			strcpy (argv[c], "-t");
 
 	while (1) {
-#ifdef HAVE_GETOPT_H
-		c =
-			getopt_long (argc, argv, "+?Vvhft46H:O:p:i:u:l:C:n:s:", long_options,
+		c = getopt_long (argc, argv, "Vvh46ft:H:O:p:i:u:l:C:n:s:", long_options,
 									 &option_index);
-#else
-		c = getopt (argc, argv, "+?Vvhft46H:O:p:i:u:l:C:n:s:");
-#endif
 
 		if (c == -1 || c == EOF)
 			break;
@@ -223,10 +214,10 @@ process_arguments (int argc, char **argv)
 			print_usage ();
 			exit (STATE_UNKNOWN);
 		case 'V':									/* version */
-			print_revision (PROGNAME, "$Revision$");
+			print_revision (progname, "$Revision$");
 			exit (STATE_OK);
 		case 'h':									/* help */
-			print_help (PROGNAME);
+			print_help (progname);
 			exit (STATE_OK);
 		case 'v':									/* help */
 			verbose = TRUE;
@@ -251,12 +242,12 @@ process_arguments (int argc, char **argv)
 			passive = TRUE;
 			break;
 		case 's':									/* description of service to check */
-			service = realloc (service, ++services);
+			service = realloc (service, (++services) * sizeof(char *));
 			p1 = optarg;
 			while (p2 = index (p1, ':')) {
 				*p2 = '\0';
 				asprintf (&service[services-1], "%s", p1);
-				service = realloc (service, ++services);
+				service = realloc (service, (++services) * sizeof(char *));
 				p1 = p2 + 1;
 			}
 			asprintf (&service[services-1], "%s", p1);
@@ -285,14 +276,19 @@ process_arguments (int argc, char **argv)
 
 	c = optind;
 	if (hostname == NULL) {
-		if (!is_host (argv[c]))
-			terminate (STATE_UNKNOWN, "%s: Invalid host name %s\n", PROGNAME, argv[c]);
+		if (c <= argc) {
+			terminate (STATE_UNKNOWN, "%s: You must provide a host name\n", progname);
+		} else if (!is_host (argv[c]))
+			terminate (STATE_UNKNOWN, "%s: Invalid host name %s\n", progname, argv[c]);
 		hostname = argv[c++];
 	}
 
 	if (strlen(remotecmd) == 0) {
 		for (; c < argc; c++)
-			asprintf (&remotecmd, "%s %s", remotecmd, argv[c]);
+			if (strlen(remotecmd) > 0)
+				asprintf (&remotecmd, "%s %s", remotecmd, argv[c]);
+			else
+				asprintf (&remotecmd, "%s", argv[c]);
 	}
 
 	if (commands > 1)
@@ -317,10 +313,10 @@ validate_arguments (void)
 		return ERROR;
 
 	if (passive && commands != services)
-		terminate (STATE_UNKNOWN, "%s: In passive mode, you must provide a service name for each command.\n", PROGNAME);
+		terminate (STATE_UNKNOWN, "%s: In passive mode, you must provide a service name for each command.\n", progname);
 
 	if (passive && host_shortname == NULL)
-		terminate (STATE_UNKNOWN, "%s: In passive mode, you must provide the host short name from the nagios configs.\n", PROGNAME);
+		terminate (STATE_UNKNOWN, "%s: In passive mode, you must provide the host short name from the nagios configs.\n", progname);
 
 	return OK;
 }
@@ -330,7 +326,7 @@ validate_arguments (void)
 
 
 void
-print_help (char *cmd)
+print_help (const char *cmd)
 {
 	print_revision (cmd, "$Revision$");