svn commit: r328283 - in head/net-mgmt/nagios-plugins: . files

[Dmitry Sivachenko]

Author: demon
Date: Wed Sep 25 13:06:12 2013
New Revision: 328283
URL: http://svnweb.freebsd.org/changeset/ports/328283

Log:
  Get rid of sshd: Read from socket failed: Connection reset by peer [preauth]
  in server logs when using check_ssh.

Added:
  head/net-mgmt/nagios-plugins/files/patch-plugins-check_ssh.c   (contents, props changed)
Modified:
  head/net-mgmt/nagios-plugins/Makefile

Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile	Wed Sep 25 13:02:26 2013	(r328282)
+++ head/net-mgmt/nagios-plugins/Makefile	Wed Sep 25 13:06:12 2013	(r328283)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nagios-plugins
 PORTVERSION=	1.4.16
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/nagiosplug/nagiosplug/${PORTVERSION}

Added: head/net-mgmt/nagios-plugins/files/patch-plugins-check_ssh.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins-check_ssh.c	Wed Sep 25 13:06:12 2013	(r328283)
@@ -0,0 +1,18 @@
+--- plugins/check_ssh.c.orig	2012-06-27 21:32:47.000000000 +0400
++++ plugins/check_ssh.c	2013-09-25 17:03:01.000000000 +0400
+@@ -250,6 +250,7 @@ ssh_connect (char *haddr, int hport, cha
+ 			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_connect (char *haddr, int hport, cha
+ 			(_("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);
+ 	}