X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_snmp.c;h=ef411e15fe59208e521b66fbdb7a723cbaff06a2;hb=187f86275426bfb501c7180c48161e1e22af1ef7;hp=35d21479bcc753e87c6d6ce23584ded1d280cb59;hpb=f275f7ff070f249144ccdcd92a8e81b8e44b2d19;p=nagiosplug.git

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 35d2147..ef411e1 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -1,43 +1,39 @@
 /******************************************************************************
- *
- * CHECK_SNMP.C
- *
- * Program: SNMP plugin for Nagios
- * License: GPL
- * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
- *
- * Last Modified: $Date$
- *
- * Description:
- *
- * This plugin uses the 'snmpget' command included with the UCD-SNMP
- * package.  If you don't have the package installed you will need to
- * download it from http://ucd-snmp.ucdavis.edu before you can use
- * this plugin.
- *
- * License Information:
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *./plugins/check_snmp 127.0.0.1 -c public -o .1.3.6.1.4.1.2021.9.1.2.1
- *****************************************************************************/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ $Id$
+ 
+******************************************************************************/
+
+const char *progname = "check_snmp";
+const char *revision = "$Revision$";
+const char *copyright = "1999-2004";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
 #include "utils.h"
 #include "popen.h"
 
-#define PROGNAME check_snmp
+#define DEFAULT_COMMUNITY "public"
+#define DEFAULT_PORT "161"
+#define DEFAULT_MIBLIST "ALL"
+#define DEFAULT_PROTOCOL "1"
+#define DEFAULT_AUTH_PROTOCOL "MD5"
+#define DEFAULT_DELIMITER "="
+#define DEFAULT_OUTPUT_DELIMITER " "
 
 #define mark(a) ((a)!=0?"*":"")
 
@@ -65,19 +61,17 @@
 
 #define MAX_OIDS 8
 #define MAX_DELIM_LENGTH 8
-#define DEFAULT_DELIMITER "="
-#define DEFAULT_OUTPUT_DELIMITER " "
 
-void print_usage (void);
-void print_help (char *);
 int process_arguments (int, char **);
-int call_getopt (int, char **);
-int check_num (int);
+int validate_arguments (void);
 char *clarify_message (char *);
+int check_num (int);
 int lu_getll (unsigned long *, char *);
 int lu_getul (unsigned long *, char *);
 char *thisarg (char *str);
 char *nextarg (char *str);
+void print_usage (void);
+void print_help (void);
 
 #ifdef HAVE_REGEX_H
 #include <regex.h>
@@ -85,7 +79,6 @@ char regex_expect[MAX_INPUT_BUFFER] = "";
 regex_t preg;
 regmatch_t pmatch[10];
 char timestamp[10] = "";
-char regex[MAX_INPUT_BUFFER];
 char errbuf[MAX_INPUT_BUFFER];
 int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
 int eflags = 0;
@@ -94,17 +87,24 @@ int errcode, excode;
 
 char *server_address = NULL;
 char *community = NULL;
-char *oid = NULL;
-char *label = NULL;
-char *units = NULL;
-char *port = NULL;
+char *authpriv = NULL;
+char *proto = NULL;
+char *seclevel = NULL;
+char *secname = NULL;
+char *authproto = NULL;
+char *authpasswd = NULL;
+char *privpasswd = NULL;
+char *oid;
+char *label;
+char *units;
+char *port;
 char string_value[MAX_INPUT_BUFFER] = "";
 char **labels = NULL;
 char **unitv = NULL;
-int nlabels = 0;
-int labels_size = 8;
-int nunits = 0;
-int unitv_size = 8;
+size_t nlabels = 0;
+size_t labels_size = 8;
+size_t nunits = 0;
+size_t unitv_size = 8;
 int verbose = FALSE;
 unsigned long lower_warn_lim[MAX_OIDS];
 unsigned long upper_warn_lim[MAX_OIDS];
@@ -113,9 +113,11 @@ unsigned long upper_crit_lim[MAX_OIDS];
 unsigned long response_value[MAX_OIDS];
 int check_warning_value = FALSE;
 int check_critical_value = FALSE;
-int eval_method[MAX_OIDS];
-char *delimiter = NULL;
-char *output_delim = NULL;
+unsigned long eval_method[MAX_OIDS];
+char *delimiter;
+char *output_delim;
+char *miblist;
+
 
 
 int
@@ -128,41 +130,54 @@ main (int argc, char **argv)
 	char input_buffer[MAX_INPUT_BUFFER];
 	char *command_line = NULL;
 	char *response = NULL;
-	char *outbuff = NULL;
-	char *output = NULL;
+	char *outbuff;
+	char *output;
 	char *ptr = NULL;
 	char *p2 = NULL;
 	char *show = NULL;
 
+	setlocale (LC_ALL, "");
+	bindtextdomain (PACKAGE, LOCALEDIR);
+	textdomain (PACKAGE);
+
 	labels = malloc (labels_size);
 	unitv = malloc (unitv_size);
-	outbuff = strscpy (outbuff, "");
 	for (i = 0; i < MAX_OIDS; i++)
 		eval_method[i] = CHECK_UNDEF;
 	i = 0;
 
+	oid = strdup ("");
+	label = strdup ("SNMP");
+	units = strdup ("");
+	port = strdup (DEFAULT_PORT);
+	outbuff = strdup ("");
+	output = strdup ("");
+	delimiter = strdup (DEFAULT_DELIMITER);
+	output_delim = strdup (DEFAULT_OUTPUT_DELIMITER);
+	miblist = strdup (DEFAULT_MIBLIST);
+
 	if (process_arguments (argc, argv) == ERROR)
-		usage ("Incorrect arguments supplied\n");
+		usage4 (_("Could not parse arguments"));
 
 	/* create the command line to execute */
-	asprintf (&command_line, "%s -p %s -m ALL -v 1 %s -c %s %s",
-	          PATH_TO_SNMPGET, port, server_address, community, oid);
+	asprintf (&command_line, "%s -t 1 -r %d -m %s -v %s %s %s:%s %s",
+	          PATH_TO_SNMPGET, timeout_interval - 1, miblist, proto,
+	          authpriv, server_address, port, oid);
 	if (verbose)
 		printf ("%s\n", command_line);
 
 	/* run the command */
 	child_process = spopen (command_line);
 	if (child_process == NULL) {
-		printf ("Could not open pipe: %s\n", command_line);
+		printf (_("Could not open pipe: %s\n"), command_line);
 		exit (STATE_UNKNOWN);
 	}
 
 	child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
 	if (child_stderr == NULL) {
-		printf ("Could not open stderr for %s\n", command_line);
+		printf (_("Could not open stderr for %s\n"), command_line);
 	}
 
-	asprintf (&output, "");
 	while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
 		asprintf (&output, "%s%s", output, input_buffer);
 
@@ -199,44 +214,58 @@ main (int argc, char **argv)
 				ptr = strpbrk (ptr, "\n");
 			}
 			if (ptr && strstr (ptr, delimiter) == NULL) {
-				response = strscat (response, ptr);
+				asprintf (&response, "%s%s", response, ptr);
 				ptr = NULL;
 			}
 		}
 
+		/* We strip out the datatype indicator for PHBs */
 		if (strstr (response, "Gauge: "))
 			show = strstr (response, "Gauge: ") + 7;
 		else if (strstr (response, "Gauge32: "))
 			show = strstr (response, "Gauge32: ") + 9;
+		else if (strstr (response, "Counter32: "))
+			show = strstr (response, "Counter32: ") + 11;
+		else if (strstr (response, "INTEGER: "))
+			show = strstr (response, "INTEGER: ") + 9;
+		else if (strstr (response, "STRING: "))
+			show = strstr (response, "STRING: ") + 8;
 		else
 			show = response;
 		p2 = show;
 
+		iresult = STATE_DEPENDENT;
+
+		/* Process this block for integer comparisons */
 		if (eval_method[i] & CRIT_GT ||
-				eval_method[i] & CRIT_LT ||
-				eval_method[i] & CRIT_GE ||
-				eval_method[i] & CRIT_LE ||
-				eval_method[i] & CRIT_EQ ||
-				eval_method[i] & CRIT_NE ||
-				eval_method[i] & WARN_GT ||
-				eval_method[i] & WARN_LT ||
-				eval_method[i] & WARN_GE ||
-				eval_method[i] & WARN_LE ||
-				eval_method[i] & WARN_EQ || eval_method[i] & WARN_NE) {
+		    eval_method[i] & CRIT_LT ||
+		    eval_method[i] & CRIT_GE ||
+		    eval_method[i] & CRIT_LE ||
+		    eval_method[i] & CRIT_EQ ||
+		    eval_method[i] & CRIT_NE ||
+		    eval_method[i] & WARN_GT ||
+		    eval_method[i] & WARN_LT ||
+		    eval_method[i] & WARN_GE ||
+		    eval_method[i] & WARN_LE ||
+		    eval_method[i] & WARN_EQ ||
+		    eval_method[i] & WARN_NE) {
 			p2 = strpbrk (p2, "0123456789");
+			if (p2 == NULL) 
+				die (STATE_UNKNOWN,_("No valid data returned"));
 			response_value[i] = strtoul (p2, NULL, 10);
 			iresult = check_num (i);
 			asprintf (&show, "%lu", response_value[i]);
-			/*asprintf (&show, "%s", response); */
 		}
 
+		/* Process this block for string matching */
 		else if (eval_method[i] & CRIT_STRING) {
-			if (strcmp (response, string_value))
+			if (strcmp (show, string_value))
 				iresult = STATE_CRITICAL;
 			else
 				iresult = STATE_OK;
 		}
 
+		/* Process this block for regex matching */
 		else if (eval_method[i] & CRIT_REGEX) {
 #ifdef HAVE_REGEX_H
 			excode = regexec (&preg, response, 10, pmatch, eflags);
@@ -245,30 +274,33 @@ main (int argc, char **argv)
 			}
 			else if (excode != REG_NOMATCH) {
 				regerror (excode, &preg, errbuf, MAX_INPUT_BUFFER);
-				printf ("Execute Error: %s\n", errbuf);
+				printf (_("Execute Error: %s\n"), errbuf);
 				exit (STATE_CRITICAL);
 			}
 			else {
 				iresult = STATE_CRITICAL;
 			}
 #else
-			printf ("SNMP UNKNOWN: call for regex which was not a compiled option");
+			printf (_("Call for regex which was not a compiled option"));
 			exit (STATE_UNKNOWN);
 #endif
 		}
 
+		/* Process this block for existence-nonexistence checks */
 		else {
-			if (response)
-				iresult = STATE_OK;
-			else if (eval_method[i] & CRIT_PRESENT)
+			if (eval_method[i] & CRIT_PRESENT)
 				iresult = STATE_CRITICAL;
-			else
+			else if (eval_method[i] & WARN_PRESENT)
 				iresult = STATE_WARNING;
+			else if (response && iresult == STATE_DEPENDENT) 
+				iresult = STATE_OK;
 		}
 
+		/* Result is the worst outcome of all the OIDs tested */
 		result = max_state (result, iresult);
 
-		if (nlabels > 1 && i < nlabels && labels[i] != NULL)
+		/* Prepend a label for this OID if there is one */
+		if (nlabels > (size_t)1 && (size_t)i < nlabels && labels[i] != NULL)
 			asprintf (&outbuff, "%s%s%s %s%s%s", outbuff,
 			          (i == 0) ? " " : output_delim,
 			          labels[i], mark (iresult), show, mark (iresult));
@@ -276,18 +308,19 @@ main (int argc, char **argv)
 			asprintf (&outbuff, "%s%s%s%s%s", outbuff, (i == 0) ? " " : output_delim,
 			          mark (iresult), show, mark (iresult));
 
-		if (nunits > 0 && i < nunits)
+		/* Append a unit string for this OID if there is one */
+		if (nunits > (size_t)0 && (size_t)i < nunits && unitv[i] != NULL)
 			asprintf (&outbuff, "%s %s", outbuff, unitv[i]);
 
 		i++;
 
-	}															/* end while */
+	}															/* end while (ptr) */
 
 	if (found == 0)
-		terminate
-			(STATE_UNKNOWN,
-			 "%s problem - No data recieved from host\nCMD: %s\n",
-			 label, command_line);
+		die (STATE_UNKNOWN,
+		     _("%s problem - No data received from host\nCMD: %s\n"),
+		     label,
+		     command_line);
 
 	/* WARNING if output found on stderr */
 	if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
@@ -300,25 +333,26 @@ main (int argc, char **argv)
 	if (spclose (child_process))
 		result = max_state (result, STATE_WARNING);
 
-	if (nunits > 0)
-		printf ("%s %s -%s\n", label, state_text (result), outbuff);
-	else
-		printf ("%s %s -%s %s\n", label, state_text (result), outbuff, units);
+/* 	if (nunits == 1 || i == 1) */
+/* 		printf ("%s %s -%s %s\n", label, state_text (result), outbuff, units); */
+/* 	else */
+	printf ("%s %s -%s\n", label, state_text (result), outbuff);
 
 	return result;
 }
 
+
+
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
 {
 	char *ptr;
-	int c, i = 1;
-	int j = 0, jj = 0;
+	int c = 1;
+	int j = 0, jj = 0, ii = 0;
 
-#ifdef HAVE_GETOPT_H
-	int option_index = 0;
-	static struct option long_options[] = {
+	int option = 0;
+	static struct option longopts[] = {
 		STD_LONG_OPTS,
 		{"community", required_argument, 0, 'C'},
 		{"oid", required_argument, 0, 'o'},
@@ -332,9 +366,15 @@ process_arguments (int argc, char **argv)
 		{"label", required_argument, 0, 'l'},
 		{"units", required_argument, 0, 'u'},
 		{"port", required_argument, 0, 'p'},
+		{"miblist", required_argument, 0, 'm'},
+		{"protocol", required_argument, 0, 'P'},
+		{"seclevel", required_argument, 0, 'L'},
+		{"secname", required_argument, 0, 'U'},
+		{"authproto", required_argument, 0, 'a'},
+		{"authpasswd", required_argument, 0, 'A'},
+		{"privpasswd", required_argument, 0, 'X'},
 		{0, 0, 0, 0}
 	};
-#endif
 
 	if (argc < 2)
 		return ERROR;
@@ -349,51 +389,69 @@ process_arguments (int argc, char **argv)
 			strcpy (argv[c], "-c");
 	}
 
-	/* initialize some args */
-	asprintf (&oid, "");
-
 	while (1) {
-#ifdef HAVE_GETOPT_H
-		c =
-			getopt_long (argc, argv, "+?hVt:c:w:H:C:o:d:D:s:R:r:l:u:p:",
-									 long_options, &option_index);
-#else
-		c = getopt (argc, argv, "+?hVt:c:w:H:C:o:d:D:s:R:r:l:u:p:");
-#endif
+		c = getopt_long (argc, argv, "hvVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:m:P:L:U:a:A:X:",
+									 longopts, &option);
 
 		if (c == -1 || c == EOF)
 			break;
 
 		switch (c) {
-		case '?':									/* help */
-			printf ("%s: Unknown argument: %s\n\n", my_basename (argv[0]), optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
-		case 'h':									/* help */
-			print_help (my_basename (argv[0]));
-			exit (STATE_OK);
-		case 'V':									/* version */
-			print_revision (my_basename (argv[0]), "$Revision$");
+		case '?':	/* usage */
+			usage2 (_("Unknown argument"), optarg);
+		case 'h':	/* help */
+			print_help ();
+			exit (STATE_OK); 
+		case 'V':	/* version */
+			print_revision (progname, revision);
 			exit (STATE_OK);
 		case 'v': /* verbose */
 			verbose = TRUE;
 			break;
-		case 't':									/* timeout period */
-			if (!is_integer (optarg)) {
-				printf ("%s: Timeout Interval must be an integer!\n\n",
-								my_basename (argv[0]));
-				print_usage ();
-				exit (STATE_UNKNOWN);
-			}
-			timeout_interval = atoi (optarg);
+
+	/* Connection info */
+		case 'C':									/* group or community */
+			community = optarg;
 			break;
+		case 'H':									/* Host or server */
+			server_address = optarg;
+			break;
+		case 'p':       /* TCP port number */
+			port = optarg;
+			break;
+		case 'm':      /* List of MIBS  */
+			miblist = optarg;
+			break;
+		case 'P':     /* SNMP protocol version */
+			proto = optarg;
+			break;
+		case 'L':     /* security level */
+			seclevel = optarg;
+			break;
+		case 'U':     /* security username */
+			secname = optarg;
+			break;
+		case 'a':     /* auth protocol */
+			authproto = optarg;
+			break;
+		case 'A':     /* auth passwd */
+			authpasswd = optarg;
+			break;
+		case 'X':     /* priv passwd */
+			privpasswd = optarg;
+			break;
+		case 't':	/* timeout period */
+			if (!is_integer (optarg))
+				usage2 (_("Timeout interval must be a positive integer"), optarg);
+			else
+				timeout_interval = atoi (optarg);
+			break;
+
+	/* Test parameters */
 		case 'c':									/* critical time threshold */
-			if (strspn (optarg, "0123456789:,") < strlen (optarg)) {
-				printf ("Invalid critical threshold: %s\n", optarg);
-				print_usage ();
-				exit (STATE_UNKNOWN);
-			}
-			for (ptr = optarg, jj = 0; ptr && jj < MAX_OIDS; jj++) {
+			if (strspn (optarg, "0123456789:,") < strlen (optarg))
+				usage2 (_("Invalid critical threshold: %s\n"), optarg);
+			for (ptr = optarg; ptr && jj < MAX_OIDS; jj++) {
 				if (lu_getll (&lower_crit_lim[jj], ptr) == 1)
 					eval_method[jj] |= CRIT_LT;
 				if (lu_getul (&upper_crit_lim[jj], ptr) == 1)
@@ -402,42 +460,38 @@ process_arguments (int argc, char **argv)
 			}
 			break;
 		case 'w':									/* warning time threshold */
-			if (strspn (optarg, "0123456789:,") < strlen (optarg)) {
-				printf ("Invalid warning threshold: %s\n", optarg);
-				print_usage ();
-				exit (STATE_UNKNOWN);
-			}
-			for (ptr = optarg, jj = 0; ptr && jj < MAX_OIDS; jj++) {
-				if (lu_getll (&lower_warn_lim[jj], ptr) == 1)
-					eval_method[jj] |= WARN_LT;
-				if (lu_getul (&upper_warn_lim[jj], ptr) == 1)
-					eval_method[jj] |= WARN_GT;
+			if (strspn (optarg, "0123456789:,") < strlen (optarg))
+				usage2 (_("Invalid warning threshold: %s\n"), optarg);
+			for (ptr = optarg; ptr && ii < MAX_OIDS; ii++) {
+				if (lu_getll (&lower_warn_lim[ii], ptr) == 1)
+					eval_method[ii] |= WARN_LT;
+				if (lu_getul (&upper_warn_lim[ii], ptr) == 1)
+					eval_method[ii] |= WARN_GT;
 				(ptr = index (ptr, ',')) ? ptr++ : ptr;
 			}
 			break;
-		case 'H':									/* Host or server */
-			server_address = strscpy (server_address, optarg);
-			break;
-		case 'C':									/* group or community */
-			community = strscpy (community, optarg);
-			break;
 		case 'o':									/* object identifier */
+		case 'e': /* PRELIMINARY - may change */
+		case 'E': /* PRELIMINARY - may change */
 			for (ptr = optarg; (ptr = index (ptr, ',')); ptr++)
 				ptr[0] = ' '; /* relpace comma with space */
-			for (ptr = optarg, j = 1; (ptr = index (ptr, ' ')); ptr++)
+			for (ptr = optarg; (ptr = index (ptr, ' ')); ptr++)
 				j++; /* count OIDs */
-			asprintf (&oid, "%s %s", oid, optarg);
-			break;
-		case 'd':									/* delimiter */
-			delimiter = strscpy (delimiter, optarg);
-			break;
-		case 'D':									/* output-delimiter */
-			output_delim = strscpy (output_delim, optarg);
+			asprintf (&oid, "%s %s", (oid?oid:""), optarg);
+			if (c == 'E' || c == 'e') {
+				jj++;
+				ii++;
+			}
+			if (c == 'E') 
+				eval_method[j+1] |= WARN_PRESENT;
+			else if (c == 'e')
+				eval_method[j+1] |= CRIT_PRESENT;
 			break;
 		case 's':									/* string or substring */
 			strncpy (string_value, optarg, sizeof (string_value) - 1);
 			string_value[sizeof (string_value) - 1] = 0;
 			eval_method[jj++] = CRIT_STRING;
+			ii++;
 			break;
 		case 'R':									/* regex */
 #ifdef HAVE_REGEX_H
@@ -451,15 +505,24 @@ process_arguments (int argc, char **argv)
 			errcode = regcomp (&preg, regex_expect, cflags);
 			if (errcode != 0) {
 				regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
-				printf ("Could Not Compile Regular Expression");
+				printf (_("Could Not Compile Regular Expression"));
 				return ERROR;
 			}
 			eval_method[jj++] = CRIT_REGEX;
+			ii++;
 #else
-			printf ("SNMP UNKNOWN: call for regex which was not a compiled option");
+			printf (_("call for regex which was not a compiled option"));
 			exit (STATE_UNKNOWN);
 #endif
 			break;
+
+	/* Format */
+		case 'd':									/* delimiter */
+			delimiter = strscpy (delimiter, optarg);
+			break;
+		case 'D':									/* output-delimiter */
+			output_delim = strscpy (output_delim, optarg);
+			break;
 		case 'l':									/* label */
 			label = optarg;
 			nlabels++;
@@ -467,21 +530,19 @@ process_arguments (int argc, char **argv)
 				labels_size += 8;
 				labels = realloc (labels, labels_size);
 				if (labels == NULL)
-					terminate (STATE_UNKNOWN,
-										 "Could not realloc() labels[%d]", nlabels);
+					die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), nlabels);
 			}
 			labels[nlabels - 1] = optarg;
 			ptr = thisarg (optarg);
+			labels[nlabels - 1] = ptr;
 			if (strstr (ptr, "'") == ptr)
 				labels[nlabels - 1] = ptr + 1;
-			else
-				labels[nlabels - 1] = ptr;
 			while (ptr && (ptr = nextarg (ptr))) {
 				if (nlabels >= labels_size) {
 					labels_size += 8;
 					labels = realloc (labels, labels_size);
 					if (labels == NULL)
-						terminate (STATE_UNKNOWN, "Could not realloc() labels\n");
+						die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
 				}
 				labels++;
 				ptr = thisarg (ptr);
@@ -498,21 +559,19 @@ process_arguments (int argc, char **argv)
 				unitv_size += 8;
 				unitv = realloc (unitv, unitv_size);
 				if (unitv == NULL)
-					terminate (STATE_UNKNOWN,
-										 "Could not realloc() units [%d]\n", nunits);
+					die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), nunits);
 			}
 			unitv[nunits - 1] = optarg;
 			ptr = thisarg (optarg);
+			unitv[nunits - 1] = ptr;
 			if (strstr (ptr, "'") == ptr)
 				unitv[nunits - 1] = ptr + 1;
-			else
-				unitv[nunits - 1] = ptr;
 			while (ptr && (ptr = nextarg (ptr))) {
 				if (nunits >= unitv_size) {
 					unitv_size += 8;
 					unitv = realloc (unitv, unitv_size);
 					if (units == NULL)
-						terminate (STATE_UNKNOWN, "Could not realloc() units\n");
+						die (STATE_UNKNOWN, _("Could not realloc() units\n"));
 				}
 				nunits++;
 				ptr = thisarg (ptr);
@@ -522,111 +581,94 @@ process_arguments (int argc, char **argv)
 					unitv[nunits - 1] = ptr;
 			}
 			break;
-		case 'p':       /* TCP port number */
-			port = strscpy(port, optarg);
-			break;
 
 		}
 	}
 
-	c = optind;
 	if (server_address == NULL)
-		server_address = strscpy (NULL, argv[c++]);
+		server_address = argv[optind];
 
 	if (community == NULL)
-		community = strscpy (NULL, "public");
+		community = strdup (DEFAULT_COMMUNITY);
 
-	if (delimiter == NULL)
-		delimiter = strscpy (NULL, DEFAULT_DELIMITER);
+	return validate_arguments ();
+}
 
-	if (output_delim == NULL)
-		output_delim = strscpy (NULL, DEFAULT_OUTPUT_DELIMITER);
 
-	if (label == NULL)
-		label = strscpy (NULL, "SNMP");
+/******************************************************************************
 
-	if (units == NULL)
-		units = strscpy (NULL, "");
+@@-
+<sect3>
+<title>validate_arguments</title>
 
-	if (port == NULL)
-		port = strscpy(NULL,"161");
+<para>&PROTO_validate_arguments;</para>
 
-	return i;
-}
+<para>Given a database name, this function returns TRUE if the string
+is a valid PostgreSQL database name, and returns false if it is
+not.</para>
 
-void
-print_usage (void)
-{
-	printf
-		("Usage: check_snmp -H <ip_address> -o <OID> [-w warn_range] [-c crit_range] \n"
-		 "                  [-C community] [-s string] [-r regex] [-R regexi] [-t timeout]\n"
-		 "                  [-l label] [-u units] [-p port-number] [-d delimiter] [-D output-delimiter]\n"
-		 "       check_snmp --help\n" "       check_snmp --version\n");
-}
+<para>Valid PostgreSQL database names are less than &NAMEDATALEN;
+characters long and consist of letters, numbers, and underscores. The
+first character cannot be a number, however.</para>
 
-void
-print_help (char *cmd)
+</sect3>
+-@@
+******************************************************************************/
+
+
+
+int
+validate_arguments ()
 {
-	printf ("Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)\n"
-					"License: GPL\n\n");
-	print_usage ();
-	printf
-		("\nOptions:\n"
-		 " -h, --help\n"
-		 "    Print detailed help screen\n"
-		 " -V, --version\n"
-		 "    Print version information\n"
-		 " -H, --hostname=HOST\n"
-		 "    Name or IP address of the device you wish to query\n"
-		 " -o, --oid=OID(s)\n"
-		 "    Object identifier(s) whose value you wish to query\n"
-		 " -w, --warning=INTEGER_RANGE(s)\n"
-		 "    Range(s) which will not result in a WARNING status\n"
-		 " -c, --critical=INTEGER_RANGE(s)\n"
-		 "    Range(s) which will not result in a CRITICAL status\n"
-		 " -C, --community=STRING\n"
-		 "    Optional community string for SNMP communication\n"
-		 "    (default is \"public\")\n"
-		 " -u, --units=STRING\n"
-		 "    Units label(s) for output data (e.g., 'sec.').\n"
-		 " -p, --port=STRING\n"
-         "    UDP port number target is listening on.\n"
-		 " -d, --delimiter=STRING\n"
-		 "    Delimiter to use when parsing returned data. Default is \"%s\"\n"
-		 "    Any data on the right hand side of the delimiter is considered\n"
-		 "    to be the data that should be used in the evaluation.\n"
-		 " -t, --timeout=INTEGER\n"
-		 "    Seconds to wait before plugin times out (see also nagios server timeout)\n"
-		 " -D, --output-delimiter=STRING\n"
-		 "    Separates output on multiple OID requests\n"
-		 " -s, --string=STRING\n"
-		 "    Return OK state (for that OID) if STRING is an exact match\n"
-		 " -r, --ereg=REGEX\n"
-		 "    Return OK state (for that OID) if extended regular expression REGEX matches\n"
-		 " -R, --eregi=REGEX\n"
-		 "    Return OK state (for that OID) if case-insensitive extended REGEX matches\n"
-		 " -l, --label=STRING\n"
-		 "    Prefix label for output from plugin (default -s 'SNMP')\n\n"
-		 "- This plugin uses the 'snmpget' command included with the UCD-SNMP package.\n"
-		 "  If you don't have the package installed, you will need to download it from\n"
-		 "  http://ucd-snmp.ucdavis.edu before you can use this plugin.\n"
-		 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists with\n"
-		 "  internal spaces must be quoted)\n"
-		 "- Ranges are inclusive and are indicated with colons. When specified as\n"
-		 "  'min:max' a STATE_OK will be returned if the result is within the indicated\n"
-		 "  range or is equal to the upper or lower bound. A non-OK state will be\n"
-		 "  returned if the result is outside the specified range.\n"
-		 "- If spcified in the order 'max:min' a non-OK state will be returned if the\n"
-		 "  result is within the (inclusive) range.\n"
-		 "- Upper or lower bounds may be omitted to skip checking the respective limit.\n"
-		 "- Bare integers are interpreted as upper limits.\n"
-		 "- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'\n"
-		 "- Note that only one string and one regex may be checked at present\n"
-		 "- All evaluation methods other than PR, STR, and SUBSTR expect that the value\n"
-		 "  returned from the SNMP query is an unsigned integer.\n\n",
-		 DEFAULT_DELIMITER);
+
+	/* Need better checks to verify seclevel and authproto choices */
+	
+	if (seclevel == NULL) 
+		asprintf (&seclevel, "noAuthNoPriv");
+
+
+	if (authproto == NULL ) 
+		asprintf(&authproto, DEFAULT_AUTH_PROTOCOL);
+	
+	 
+	
+	if (proto == NULL || (strcmp(proto,DEFAULT_PROTOCOL) == 0) ) {        /* default protocol version */
+		asprintf(&proto, DEFAULT_PROTOCOL);
+		asprintf(&authpriv, "%s%s", "-c ", community);
+	}
+	else if ( strcmp (proto, "3") == 0 ) {                 /* snmpv3 args */
+		asprintf(&proto, "%s", "3");
+		
+		if ( (strcmp(seclevel, "noAuthNoPriv") == 0) || seclevel == NULL ) {
+			asprintf(&authpriv, "%s", "-l noAuthNoPriv" );
+		}
+		else if ( strcmp(seclevel, "authNoPriv") == 0 ) {
+			if ( secname == NULL || authpasswd == NULL) {
+				printf (_("Missing secname (%s) or authpassword (%s) ! \n"),secname, authpasswd );
+				print_usage ();
+				exit (STATE_UNKNOWN);
+			}
+			asprintf(&authpriv, "-l authNoPriv -a %s -u %s -A %s ", authproto, secname, authpasswd);
+		}
+		else if ( strcmp(seclevel, "authPriv") == 0 ) {
+			if ( secname == NULL || authpasswd == NULL || privpasswd == NULL ) {
+				printf (_("Missing secname (%s), authpassword (%s), or privpasswd (%s)! \n"),secname, authpasswd,privpasswd );
+				print_usage ();
+				exit (STATE_UNKNOWN);
+			}
+			asprintf(&authpriv, "-l authPriv -a %s -u %s -A %s -x DES -X %s ", authproto, secname, authpasswd, privpasswd);
+		}
+		
+	}
+	else {
+		usage2 (_("Invalid SNMP version"), proto);
+	}
+			
+	return OK;
 }
 
+
+
 char *
 clarify_message (char *msg)
 {
@@ -663,6 +705,7 @@ clarify_message (char *msg)
 }
 
 
+
 int
 check_num (int i)
 {
@@ -686,7 +729,7 @@ check_num (int i)
 	}
 
 	if (eval_method[i] & CRIT_GT && eval_method[i] & CRIT_LT &&
-			lower_warn_lim[i] > upper_warn_lim[i]) {
+			lower_crit_lim[i] > upper_crit_lim[i]) {
 		if (response_value[i] <= lower_crit_lim[i] &&
 				response_value[i] >= upper_crit_lim[i]) {
 			result = STATE_CRITICAL;
@@ -706,6 +749,7 @@ check_num (int i)
 }
 
 
+
 int
 lu_getll (unsigned long *ll, char *str)
 {
@@ -719,6 +763,8 @@ lu_getll (unsigned long *ll, char *str)
 	return 0;
 }
 
+
+
 int
 lu_getul (unsigned long *ul, char *str)
 {
@@ -734,9 +780,6 @@ lu_getul (unsigned long *ul, char *str)
 
 
 
-
-
-
 /* trim leading whitespace
 	 if there is a leading quote, make sure it balances */
 
@@ -746,12 +789,13 @@ thisarg (char *str)
 	str += strspn (str, " \t\r\n");	/* trim any leading whitespace */
 	if (strstr (str, "'") == str) {	/* handle SIMPLE quoted strings */
 		if (strlen (str) == 1 || !strstr (str + 1, "'"))
-			terminate (STATE_UNKNOWN, "Unbalanced quotes\n");
+			die (STATE_UNKNOWN, _("Unbalanced quotes\n"));
 	}
 	return str;
 }
 
 
+
 /* if there's a leading quote, advance to the trailing quote
 	 set the trailing quote to '\x0'
 	 if the string continues, advance beyond the comma */
@@ -760,23 +804,21 @@ char *
 nextarg (char *str)
 {
 	if (strstr (str, "'") == str) {
+		str[0] = 0;
 		if (strlen (str) > 1) {
 			str = strstr (str + 1, "'");
-			str[0] = 0;
 			return (++str);
 		}
 		else {
-			str[0] = 0;
 			return NULL;
 		}
 	}
 	if (strstr (str, ",") == str) {
+		str[0] = 0;
 		if (strlen (str) > 1) {
-			str[0] = 0;
 			return (++str);
 		}
 		else {
-			str[0] = 0;
 			return NULL;
 		}
 	}
@@ -786,3 +828,125 @@ nextarg (char *str)
 	}
 	return NULL;
 }
+
+
+
+void
+print_help (void)
+{
+	print_revision (progname, revision);
+
+	printf (COPYRIGHT, copyright, email);
+
+	printf (_("\
+Check status of remote machines and obtain sustem information via SNMP\n\n"));
+
+	print_usage ();
+
+	printf (_(UT_HELP_VRSN));
+
+	printf (_(UT_HOST_PORT), 'p', DEFAULT_PORT);
+
+	/* SNMP and Authentication Protocol */
+	printf (_("\
+ -P, --protocol=[1|3]\n\
+    SNMP protocol version\n\
+ -L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]\n\
+    SNMPv3 securityLevel\n\
+ -a, --authproto=[MD5|SHA]\n\
+    SNMPv3 auth proto\n"));
+
+	/* Authentication Tokens*/
+	printf (_("\
+ -C, --community=STRING\n\
+    Optional community string for SNMP communication\n\
+    (default is \"%s\")\n\
+ -U, --secname=USERNAME\n\
+    SNMPv3 username\n\
+ -A, --authpassword=PASSWORD\n\
+    SNMPv3 authentication password\n\
+ -X, --privpasswd=PASSWORD\n\
+    SNMPv3 crypt passwd (DES)\n"), DEFAULT_COMMUNITY);
+
+	/* OID Stuff */
+	printf (_("\
+ -o, --oid=OID(s)\n\
+    Object identifier(s) whose value you wish to query\n\
+ -m, --miblist=STRING\n\
+    List of MIBS to be loaded (default = ALL)\n -d, --delimiter=STRING\n\
+    Delimiter to use when parsing returned data. Default is \"%s\"\n\
+    Any data on the right hand side of the delimiter is considered\n\
+    to be the data that should be used in the evaluation.\n"), DEFAULT_DELIMITER);
+
+	/* Tests Against Integers */
+	printf (_("\
+ -w, --warning=INTEGER_RANGE(s)\n\
+    Range(s) which will not result in a WARNING status\n\
+ -c, --critical=INTEGER_RANGE(s)\n\
+    Range(s) which will not result in a CRITICAL status\n"));
+
+	/* Tests Against Strings */
+	printf (_("\
+ -s, --string=STRING\n\
+    Return OK state (for that OID) if STRING is an exact match\n\
+ -r, --ereg=REGEX\n\
+    Return OK state (for that OID) if extended regular expression REGEX matches\n\
+ -R, --eregi=REGEX\n\
+    Return OK state (for that OID) if case-insensitive extended REGEX matches\n\
+ -l, --label=STRING\n\
+    Prefix label for output from plugin (default -s 'SNMP')\n"));
+
+	/* Output Formatting */
+	printf (_("\
+ -u, --units=STRING\n\
+    Units label(s) for output data (e.g., 'sec.').\n\
+ -D, --output-delimiter=STRING\n\
+    Separates output on multiple OID requests\n"));
+
+	printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+
+	printf (_(UT_VERBOSE));
+
+	printf (_("\n\
+- This plugin uses the 'snmpget' command included with the NET-SNMP package.\n\
+  If you don't have the package installed, you will need to download it from\n\
+  http://net-snmp.sourceforge.net before you can use this plugin.\n"));
+
+	printf (_("\
+- Multiple OIDs may be indicated by a comma- or space-delimited list (lists with\n\
+  internal spaces must be quoted) [max 8 OIDs]\n"));
+
+	printf (_("\
+- Ranges are inclusive and are indicated with colons. When specified as\n\
+  'min:max' a STATE_OK will be returned if the result is within the indicated\n\
+  range or is equal to the upper or lower bound. A non-OK state will be\n\
+  returned if the result is outside the specified range.\n"));
+
+	printf (_("\
+- If specified in the order 'max:min' a non-OK state will be returned if the\n\
+  result is within the (inclusive) range.\n"));
+
+	printf (_("\
+- Upper or lower bounds may be omitted to skip checking the respective limit.\n\
+- Bare integers are interpreted as upper limits.\n\
+- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'\n\
+- Note that only one string and one regex may be checked at present\n\
+- All evaluation methods other than PR, STR, and SUBSTR expect that the value\n\
+  returned from the SNMP query is an unsigned integer.\n"));
+
+	printf (_(UT_SUPPORT));
+}
+
+
+
+void
+print_usage (void)
+{
+	printf ("\
+Usage: %s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range] \n\
+                  [-C community] [-s string] [-r regex] [-R regexi] [-t timeout]\n\
+                  [-l label] [-u units] [-p port-number] [-d delimiter]\n\
+                  [-D output-delimiter] [-m miblist] [-P snmp version]\n\
+                  [-L seclevel] [-U secname] [-a authproto] [-A authpasswd]\n\
+                  [-X privpasswd]\n", progname);
+}