upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-06-09 08:42:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' of ssh://nagiosplug.git.sourceforge.net/gitroot/nagiosplug/nagiosplug

Browse source
This commit is contained in:
Eric Stanley 2012-04-06 10:22:05 -05:00
commit 019c926370
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/check_http.c
View file

@ -1400,6 +1400,10 @@ print_help (void)
printf (" %s\n", _("serve content (optionally within a specified time) or whether the X509 "));
printf (" %s\n", _("certificate is still valid for the specified number of days."));
printf ("\n");
printf (" %s\n", _("Please note that this plugin does not check if the presented server"));
printf (" %s\n", _("certificate matches the hostname of the server, or if the certificate"));
printf (" %s\n", _("has a valid chain of trust to one of the locally installed CAs."));
printf ("\n");
printf ("%s\n", _("Examples:"));
printf (" %s\n\n", "CHECK CONTENT: check_http -w 5 -c 10 --ssl -H www.verisign.com");
printf (" %s\n", _("When the 'www.verisign.com' server returns its content within 5 seconds,"));

20
plugins/check_snmp.c
View file

@ -740,7 +740,7 @@ process_arguments (int argc, char **argv)
labels[nlabels - 1] = optarg;
ptr = thisarg (optarg);
labels[nlabels - 1] = ptr;
if (strstr (ptr, "'") == ptr)
if (ptr[0] == '\'')
labels[nlabels - 1] = ptr + 1;
while (ptr && (ptr = nextarg (ptr))) {
if (nlabels >= labels_size) {
@ -749,9 +749,9 @@ process_arguments (int argc, char **argv)
if (labels == NULL)
die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
}
labels++;
nlabels++;
ptr = thisarg (ptr);
if (strstr (ptr, "'") == ptr)
if (ptr[0] == '\'')
labels[nlabels - 1] = ptr + 1;
else
labels[nlabels - 1] = ptr;
@ -769,7 +769,7 @@ process_arguments (int argc, char **argv)
unitv[nunits - 1] = optarg;
ptr = thisarg (optarg);
unitv[nunits - 1] = ptr;
if (strstr (ptr, "'") == ptr)
if (ptr[0] == '\'')
unitv[nunits - 1] = ptr + 1;
while (ptr && (ptr = nextarg (ptr))) {
if (nunits >= unitv_size) {
@ -780,7 +780,7 @@ process_arguments (int argc, char **argv)
}
nunits++;
ptr = thisarg (ptr);
if (strstr (ptr, "'") == ptr)
if (ptr[0] == '\'')
unitv[nunits - 1] = ptr + 1;
else
unitv[nunits - 1] = ptr;
@ -935,7 +935,7 @@ char *
thisarg (char *str)
{
str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
if (str[0] == '\'') { /* handle SIMPLE quoted strings */
if (strlen (str) == 1 || !strstr (str + 1, "'"))
die (STATE_UNKNOWN, _("Unbalanced quotes\n"));
}
@ -951,7 +951,7 @@ thisarg (char *str)
char *
nextarg (char *str)
{
if (strstr (str, "'") == str) {
if (str[0] == '\'') {
str[0] = 0;
if (strlen (str) > 1) {
str = strstr (str + 1, "'");
@ -961,7 +961,7 @@ nextarg (char *str)
return NULL;
}
}
if (strstr (str, ",") == str) {
if (str[0] == ',') {
str[0] = 0;
if (strlen (str) > 1) {
return (++str);
@ -1072,8 +1072,8 @@ print_help (void)
printf ("\n");
printf ("%s\n", _("Notes:"));
printf (" %s\n", _("- Multiple OIDs may be indicated by a comma or space-delimited list (lists with"));
printf (" %s %i %s\n", _("internal spaces must be quoted). Maximum:"), MAX_OIDS, _("OIDs."));
printf (" %s\n", _("- Multiple OIDs (and labels) may be indicated by a comma or space-delimited "));
printf (" %s %i %s\n", _("list (lists with internal spaces must be quoted). Maximum:"), MAX_OIDS, _("OIDs."));
printf(" -%s", UT_THRESHOLDS_NOTES);