svn commit: r383616 - in head/security/openssh-portable: . files

[Bryan Drewery]

Author: bdrewery
Date: Thu Apr  9 01:49:10 2015
New Revision: 383616
URL: https://svnweb.freebsd.org/changeset/ports/383616

Log:
  Remove debugging leftover in release.
  
    error: mm_request_receive: socket closed
  
  Obtained from:	Upstream c7fe79ed7db427f1474e72b9f8b465901d61d3f6

Added:
  head/security/openssh-portable/files/patch-monitor_wrap.c   (contents, props changed)
Modified:
  head/security/openssh-portable/Makefile

Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile	Thu Apr  9 01:04:54 2015	(r383615)
+++ head/security/openssh-portable/Makefile	Thu Apr  9 01:49:10 2015	(r383616)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openssh
 DISTVERSION=	6.8p1
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	${MASTER_SITE_OPENBSD}

Added: head/security/openssh-portable/files/patch-monitor_wrap.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/openssh-portable/files/patch-monitor_wrap.c	Thu Apr  9 01:49:10 2015	(r383616)
@@ -0,0 +1,16 @@
+diff --git a/monitor_wrap.c b/monitor_wrap.c
+index b379f05..d39d491 100644
+--- monitor_wrap.c
++++ monitor_wrap.c
+@@ -153,10 +153,8 @@ mm_request_receive(int sock, Buffer *m)
+ 	debug3("%s entering", __func__);
+ 
+ 	if (atomicio(read, sock, buf, sizeof(buf)) != sizeof(buf)) {
+-		if (errno == EPIPE) {
+-			error("%s: socket closed", __func__);
++		if (errno == EPIPE)
+ 			cleanup_exit(255);
+-		}
+ 		fatal("%s: read: %s", __func__, strerror(errno));
+ 	}
+ 	msg_len = get_u32(buf);