diff options
author | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
commit | c6a2c0334e45419875687d250aed9bea78480f2e (patch) | |
tree | d8f01bef9f3921fa1ca7592a19474be9c8349f76 /monitor.c | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) | |
parent | 8b13b5bdc4f19bd52ee673104d66b71c21153b96 (diff) |
merge 6.1p1
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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> |
@@ -496,9 +496,6 @@ monitor_child_postauth(struct monitor *pmonitor) | |||
496 | 496 | ||
497 | for (;;) | 497 | for (;;) |
498 | monitor_read(pmonitor, mon_dispatch, NULL); | 498 | monitor_read(pmonitor, mon_dispatch, NULL); |
499 | |||
500 | close(pmonitor->m_sendfd); | ||
501 | pmonitor->m_sendfd = -1; | ||
502 | } | 499 | } |
503 | 500 | ||
504 | void | 501 | void |