misc doc fix, missing verbose option

[nagiosplug.git] / plugins / check_snmp.c

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index de019bac0e93133b772d6de0e09985368d76d520..5344b93051461301d68c8c080a6b30c1225f962c 100644 (file)
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -68,19 +68,23 @@
  -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"
+    Prefix label for output from plugin (default -s 'SNMP')\n\
+ -v, --verbose\n\
+    Debugging the output\n\ 
+               
+               "
 
 #define NOTES "\
-- This plugin uses the 'snmpget' command included with the UCD-SNMP package.\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://ucd-snmp.ucdavis.edu before you can use this plugin.\n\
+  http://net-snmp.sourceforge.net 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\
+  internal spaces must be quoted) [max 8 OIDs]\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\
+- If specified 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\
@@ -158,7 +162,7 @@ char *community = NULL;
 char *oid = "";
 char *label = NULL;
 char *units = NULL;
-char *port = NULL;
+char *port = DEFAULT_PORT;
 char string_value[MAX_INPUT_BUFFER] = "";
 char **labels = NULL;
 char **unitv = NULL;
@@ -418,10 +422,10 @@ process_arguments (int argc, char **argv)
        while (1) {
 #ifdef HAVE_GETOPT_H
                c =
-                       getopt_long (argc, argv, "+?hVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:",
+                       getopt_long (argc, argv, "hvVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:",
                                                                         long_options, &option_index);
 #else
-               c = getopt (argc, argv, "+?hVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:");
+               c = getopt (argc, argv, "hvVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:");
 #endif
 
                if (c == -1 || c == EOF)
@@ -429,7 +433,7 @@ process_arguments (int argc, char **argv)
 
                switch (c) {
                case '?':       /* usage */
-                       usage2 ("Unknown argument", optarg);
+                       usage3 ("Unknown argument", optopt);
                case 'h':       /* help */
                        print_help ();
                        exit (STATE_OK);
@@ -647,9 +651,6 @@ validate_arguments ()
        if (units == NULL)
                asprintf (&units, "");
 
-       if (port == NULL)
-               asprintf (&port, DEFAULT_PORT);
-
        return OK;
 }
 \f