diff options
-rwxr-xr-x | plugins-scripts/check_ifoperstatus.pl | 2 | ||||
-rw-r--r-- | plugins/check_by_ssh.c | 2 | ||||
-rw-r--r-- | plugins/check_http.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl index 9ede1633..c190ce95 100755 --- a/plugins-scripts/check_ifoperstatus.pl +++ b/plugins-scripts/check_ifoperstatus.pl | |||
@@ -124,10 +124,10 @@ if (!defined($session)) { | |||
124 | ## map ifdescr to ifindex - should look at being able to cache this value | 124 | ## map ifdescr to ifindex - should look at being able to cache this value |
125 | 125 | ||
126 | if (defined $ifdescr || defined $iftype) { | 126 | if (defined $ifdescr || defined $iftype) { |
127 | # escape "/" in ifdescr - very common in the Cisco world | ||
128 | if (defined $iftype) { | 127 | if (defined $iftype) { |
129 | $status=fetch_ifindex($snmpIfType, $iftype); | 128 | $status=fetch_ifindex($snmpIfType, $iftype); |
130 | } else { | 129 | } else { |
130 | # escape "/" in ifdescr - very common in the Cisco world | ||
131 | $ifdescr =~ s/\//\\\//g; | 131 | $ifdescr =~ s/\//\\\//g; |
132 | $status=fetch_ifindex($snmpIfDescr, $ifdescr); # if using on device with large number of interfaces | 132 | $status=fetch_ifindex($snmpIfDescr, $ifdescr); # if using on device with large number of interfaces |
133 | # recommend use of SNMP v2 (get-bulk) | 133 | # recommend use of SNMP v2 (get-bulk) |
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index 13d8bc3b..485bf3be 100644 --- a/plugins/check_by_ssh.c +++ b/plugins/check_by_ssh.c | |||
@@ -230,7 +230,6 @@ process_arguments (int argc, char **argv) | |||
230 | timeout_interval = atoi (optarg); | 230 | timeout_interval = atoi (optarg); |
231 | break; | 231 | break; |
232 | case 'H': /* host */ | 232 | case 'H': /* host */ |
233 | host_or_die(optarg); | ||
234 | hostname = optarg; | 233 | hostname = optarg; |
235 | break; | 234 | break; |
236 | case 'p': /* port number */ | 235 | case 'p': /* port number */ |
@@ -329,7 +328,6 @@ process_arguments (int argc, char **argv) | |||
329 | if (c <= argc) { | 328 | if (c <= argc) { |
330 | die (STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname); | 329 | die (STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname); |
331 | } | 330 | } |
332 | host_or_die(argv[c]); | ||
333 | hostname = argv[c++]; | 331 | hostname = argv[c++]; |
334 | } | 332 | } |
335 | 333 | ||
diff --git a/plugins/check_http.c b/plugins/check_http.c index 0b712665..34fb4f01 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
@@ -1453,8 +1453,8 @@ redir (char *pos, char *status_line) | |||
1453 | !strncmp(server_address, addr, MAX_IPV4_HOSTLENGTH) && | 1453 | !strncmp(server_address, addr, MAX_IPV4_HOSTLENGTH) && |
1454 | (host_name && !strncmp(host_name, addr, MAX_IPV4_HOSTLENGTH)) && | 1454 | (host_name && !strncmp(host_name, addr, MAX_IPV4_HOSTLENGTH)) && |
1455 | !strcmp(server_url, url)) | 1455 | !strcmp(server_url, url)) |
1456 | die (STATE_WARNING, | 1456 | die (STATE_CRITICAL, |
1457 | _("HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"), | 1457 | _("HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n"), |
1458 | type, addr, i, url, (display_html ? "</A>" : "")); | 1458 | type, addr, i, url, (display_html ? "</A>" : "")); |
1459 | 1459 | ||
1460 | strcpy (server_type, type); | 1460 | strcpy (server_type, type); |