summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-05-18 12:16:05 +0100
committerColin Watson <cjwatson@debian.org>2012-05-18 12:16:05 +0100
commitdabbdfacc9f6995b0739772a47704186dcf34ea5 (patch)
tree0a0b306a637bc85eb719261b74884f0b9573ec41 /monitor.c
parent1e0d51b642cac9a6bfb719e6320905625aa5f943 (diff)
parentdd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff)
* New upstream release (http://www.openssh.org/txt/release-6.0).
- Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections (closes: #643312, #650512). - Add a new privilege separation sandbox implementation for Linux's new seccomp sandbox, automatically enabled on platforms that support it. (Note: privilege separation sandboxing is still experimental.)
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/monitor.c b/monitor.c
index 985916b1e..d522a0753 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.115 2011/06/23 23:35:42 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.116 2012/01/05 00:16:56 djm Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -526,6 +526,7 @@ monitor_read_log(struct monitor *pmonitor)
526 if (atomicio(read, pmonitor->m_log_recvfd, 526 if (atomicio(read, pmonitor->m_log_recvfd,
527 buffer_ptr(&logmsg), buffer_len(&logmsg)) != buffer_len(&logmsg)) { 527 buffer_ptr(&logmsg), buffer_len(&logmsg)) != buffer_len(&logmsg)) {
528 if (errno == EPIPE) { 528 if (errno == EPIPE) {
529 buffer_free(&logmsg);
529 debug("%s: child log fd closed", __func__); 530 debug("%s: child log fd closed", __func__);
530 close(pmonitor->m_log_recvfd); 531 close(pmonitor->m_log_recvfd);
531 pmonitor->m_log_recvfd = -1; 532 pmonitor->m_log_recvfd = -1;