summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-09-07 00:20:47 +0100
committerColin Watson <cjwatson@debian.org>2012-09-07 00:20:47 +0100
commiteab78da6a54225de06271d9c8da650f04a55ed88 (patch)
treeaa258ca77515939f6d89317ff67fbcb0bca08b24 /monitor.c
parenta26f5de49df59322fde07f7be91b3e3969c9c238 (diff)
parentc6a2c0334e45419875687d250aed9bea78480f2e (diff)
* New upstream release (http://www.openssh.com/txt/release-6.1).
- Enable pre-auth sandboxing by default for new installs. - Allow "PermitOpen none" to refuse all port-forwarding requests (closes: #543683).
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/monitor.c b/monitor.c
index d522a0753..0f4055e54 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.116 2012/01/05 00:16:56 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.117 2012/06/22 12:30:26 dtucker 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>
@@ -498,9 +498,6 @@ monitor_child_postauth(struct monitor *pmonitor)
498 498
499 for (;;) 499 for (;;)
500 monitor_read(pmonitor, mon_dispatch, NULL); 500 monitor_read(pmonitor, mon_dispatch, NULL);
501
502 close(pmonitor->m_sendfd);
503 pmonitor->m_sendfd = -1;
504} 501}
505 502
506void 503void