summaryrefslogtreecommitdiffstats
path: root/plugins/check_ssh.c
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2014-01-21 16:07:38 +0100
committerHolger Weiss <holger@zedat.fu-berlin.de>2014-01-21 16:07:38 +0100
commit7ee3525423f17cb8269a11e679355733867131e9 (patch)
tree6b68b8bddc3603925a5eb2b996859c94e0c06b46 /plugins/check_ssh.c
parent11cf54ca78185d820085a476cdbf7d8f9149c292 (diff)
parenta3871201821d9abe8a12e637e7dd00d9d1dde2a5 (diff)
downloadmonitoring-plugins-7ee3525423f17cb8269a11e679355733867131e9.tar.gz
Merge branch 'maint'
* maint: check_ssh: Get rid of sshd: Read from socket failed: Connection reset by peer fixed tests when there is no direct internet connection NEWS: Mention fix for check_http's -S option Fix for SSL Versioning when multiple options are used. Fix #1217 spec file fails to build due to duplicate files and unused files check_http: Don't let "-N" expect an argument README: Change GitHub URL README: Clarify license notice Update URLs and mailing list addresses Just using the posix conform extended regular expression grep check_oracle: --db +ASM bad string matching check_oracle doesn't correctly check for pmon +ASM instance from at least Oracle 11 as the pmon proces was renamed from ora_pmon_.* to asm_pmon_.*. -- Just turning attached patch of github issue #1207 into a push request. (Closes #1207) Update web site URLs Conflicts: FAQ NEWS README SUPPORT configure.in monitoring-plugins.spec.in pkg/solaris/pkginfo.in plugins-root/check_dhcp.c plugins-root/check_icmp.c plugins-scripts/check_ifoperstatus.pl plugins-scripts/check_mssql.pl plugins/check_apt.c plugins/check_by_ssh.c plugins/check_cluster.c plugins/check_dbi.c plugins/check_dig.c plugins/check_disk.c plugins/check_dns.c plugins/check_dummy.c plugins/check_fping.c plugins/check_game.c plugins/check_hpjd.c plugins/check_http.c plugins/check_ide_smart.c plugins/check_ldap.c plugins/check_load.c plugins/check_mrtg.c plugins/check_mrtgtraf.c plugins/check_mysql.c plugins/check_mysql_query.c plugins/check_nagios.c plugins/check_nt.c plugins/check_ntp.c plugins/check_ntp_peer.c plugins/check_ntp_time.c plugins/check_nwstat.c plugins/check_overcr.c plugins/check_pgsql.c plugins/check_ping.c plugins/check_procs.c plugins/check_radius.c plugins/check_real.c plugins/check_smtp.c plugins/check_snmp.c plugins/check_ssh.c plugins/check_swap.c plugins/check_tcp.c plugins/check_time.c plugins/check_ups.c plugins/check_users.c plugins/negate.c plugins/urlize.c plugins/utils.h po/Makevars po/de.po po/fr.po po/monitoring-plugins.pot
Diffstat (limited to 'plugins/check_ssh.c')
-rw-r--r--plugins/check_ssh.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index f4522e2b..5c75d278 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -250,6 +250,7 @@ ssh_connect (char *haddr, int hport, char *remote_version)
250 printf 250 printf
251 (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"), 251 (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
252 ssh_server, ssh_proto, remote_version); 252 ssh_server, ssh_proto, remote_version);
253 recv (sd, output, BUFF_SZ, 0);
253 close(sd); 254 close(sd);
254 exit (STATE_WARNING); 255 exit (STATE_WARNING);
255 } 256 }
@@ -260,6 +261,7 @@ ssh_connect (char *haddr, int hport, char *remote_version)
260 (_("SSH OK - %s (protocol %s) | %s\n"), 261 (_("SSH OK - %s (protocol %s) | %s\n"),
261 ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s", 262 ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
262 FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout)); 263 FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout));
264 recv (sd, output, BUFF_SZ, 0);
263 close(sd); 265 close(sd);
264 exit (STATE_OK); 266 exit (STATE_OK);
265 } 267 }