diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-04-09 01:49:10 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-04-09 01:49:10 +0000 |
| commit | fff0fb586b77829295a311464e6cb1b43ece8519 (patch) | |
| tree | f1bc57133b8dfdacdef996e872aafeb1154f9f0f /security/openssh-portable | |
| parent | 605a348f3ec9e4c06e7995c208623ee606b99bff (diff) | |
Notes
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 2 | ||||
| -rw-r--r-- | security/openssh-portable/files/patch-monitor_wrap.c | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index eb739540edca..d13620ef7210 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.8p1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} diff --git a/security/openssh-portable/files/patch-monitor_wrap.c b/security/openssh-portable/files/patch-monitor_wrap.c new file mode 100644 index 000000000000..67e0b979c138 --- /dev/null +++ b/security/openssh-portable/files/patch-monitor_wrap.c @@ -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); |