debian/pkg-monitoring-plugins
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add 12_check_ssh_read_socket.dpatch to fix socket read failure (Closes: #734811)

Browse source
This commit is contained in:
Jan Wagner 2014-01-10 16:16:01 +01:00
parent 9bc7a29908
commit 219a55a712
2 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/patches/00list vendored
View file

@ -1,3 +1,4 @@
02_check_icmp_links.dpatch
# commited upstream
11_check_http_arguments.dpatch
12_check_ssh_read_socket.dpatch

41
debian/patches/12_check_ssh_read_socket.dpatch vendored Normal file
View file

@ -0,0 +1,41 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 12_check_ssh_read_socket.dpatch by Jan Wagner <waja@cyconet.org>
##
## From a3871201821d9abe8a12e637e7dd00d9d1dde2a5 Mon Sep 17 00:00:00 2001
## From: Jan Wagner <waja@cyconet.org>
## Date: Fri, 10 Jan 2014 15:56:30 +0100
## Subject: [PATCH] check_ssh: Get rid of sshd: Read from socket failed:
## Connection reset by peer
##
## This fix was grabbed from FreeBSD downstream and provided by Dmitry Sivachenko.
## Fixes Debian Bug #734811
@DPATCH@
---
plugins/check_ssh.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 1c032a4..2d63528 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -250,6 +250,7 @@
printf
(_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
ssh_server, ssh_proto, remote_version);
+ recv (sd, output, BUFF_SZ, 0);
close(sd);
exit (STATE_WARNING);
}
@@ -260,6 +261,7 @@
(_("SSH OK - %s (protocol %s) | %s\n"),
ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout));
+ recv (sd, output, BUFF_SZ, 0);
close(sd);
exit (STATE_OK);
}
--
1.8.5.1