diff options
author | Sven Nierlein <sven@nierlein.de> | 2014-06-30 14:52:10 +0200 |
---|---|---|
committer | Jan Wagner <waja@cyconet.org> | 2014-11-28 14:35:03 +0100 |
commit | a7d7992777963bd192cfef21988d281bc371c794 (patch) | |
tree | de9d12dd2760c3b272fa25c9d58f3742dd9905b1 | |
parent | 7ef100a3ebd8195d9ad19e6c0cd8efd9c0284ee6 (diff) | |
download | monitoring-plugins-a7d7992.tar.gz |
check_ssh: change warning to critical for protocal/version errors
It makes more sense to exit critical if a explicit version/protocol is requested. This
would also be more consistent with other plugins. Other string matching plugins like
check_snmp or check_http exit critical if the result does not match.
Signed-off-by: Sven Nierlein <sven@nierlein.de>
Closes #1268
-rw-r--r-- | plugins/check_ssh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c index b6187d61..3658965e 100644 --- a/plugins/check_ssh.c +++ b/plugins/check_ssh.c | |||
@@ -253,18 +253,18 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol | |||
253 | 253 | ||
254 | if (remote_version && strcmp(remote_version, ssh_server)) { | 254 | if (remote_version && strcmp(remote_version, ssh_server)) { |
255 | printf | 255 | printf |
256 | (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"), | 256 | (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"), |
257 | ssh_server, ssh_proto, remote_version); | 257 | ssh_server, ssh_proto, remote_version); |
258 | close(sd); | 258 | close(sd); |
259 | exit (STATE_WARNING); | 259 | exit (STATE_CRITICAL); |
260 | } | 260 | } |
261 | 261 | ||
262 | if (remote_protocol && strcmp(remote_protocol, ssh_proto)) { | 262 | if (remote_protocol && strcmp(remote_protocol, ssh_proto)) { |
263 | printf | 263 | printf |
264 | (_("SSH WARNING - %s (protocol %s) protocol version mismatch, expected '%s'\n"), | 264 | (_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"), |
265 | ssh_server, ssh_proto, remote_protocol); | 265 | ssh_server, ssh_proto, remote_protocol); |
266 | close(sd); | 266 | close(sd); |
267 | exit (STATE_WARNING); | 267 | exit (STATE_CRITICAL); |
268 | } | 268 | } |
269 | 269 | ||
270 | elapsed_time = (double)deltime(tv) / 1.0e6; | 270 | elapsed_time = (double)deltime(tv) / 1.0e6; |
@@ -307,10 +307,10 @@ print_help (void) | |||
307 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 307 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
308 | 308 | ||
309 | printf (" %s\n", "-r, --remote-version=STRING"); | 309 | printf (" %s\n", "-r, --remote-version=STRING"); |
310 | printf (" %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)")); | 310 | printf (" %s\n", _("Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)")); |
311 | 311 | ||
312 | printf (" %s\n", "-P, --remote-protocol=STRING"); | 312 | printf (" %s\n", "-P, --remote-protocol=STRING"); |
313 | printf (" %s\n", _("Warn if protocol doesn't match expected protocol version (ex: 2.0)")); | 313 | printf (" %s\n", _("Alert if protocol doesn't match expected protocol version (ex: 2.0)")); |
314 | 314 | ||
315 | printf (UT_VERBOSE); | 315 | printf (UT_VERBOSE); |
316 | 316 | ||