diff options
| author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
| commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
| tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /serverloop.c | |
| parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
| parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) | |
merge 5.9p1
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c index 8be01c5c3..19b84ff27 100644 --- a/serverloop.c +++ b/serverloop.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: serverloop.c,v 1.159 2009/05/28 16:50:16 andreas Exp $ */ | 1 | /* $OpenBSD: serverloop.c,v 1.160 2011/05/15 08:09:01 djm Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
| 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| @@ -131,8 +131,8 @@ notify_setup(void) | |||
| 131 | { | 131 | { |
| 132 | if (pipe(notify_pipe) < 0) { | 132 | if (pipe(notify_pipe) < 0) { |
| 133 | error("pipe(notify_pipe) failed %s", strerror(errno)); | 133 | error("pipe(notify_pipe) failed %s", strerror(errno)); |
| 134 | } else if ((fcntl(notify_pipe[0], F_SETFD, 1) == -1) || | 134 | } else if ((fcntl(notify_pipe[0], F_SETFD, FD_CLOEXEC) == -1) || |
| 135 | (fcntl(notify_pipe[1], F_SETFD, 1) == -1)) { | 135 | (fcntl(notify_pipe[1], F_SETFD, FD_CLOEXEC) == -1)) { |
| 136 | error("fcntl(notify_pipe, F_SETFD) failed %s", strerror(errno)); | 136 | error("fcntl(notify_pipe, F_SETFD) failed %s", strerror(errno)); |
| 137 | close(notify_pipe[0]); | 137 | close(notify_pipe[0]); |
| 138 | close(notify_pipe[1]); | 138 | close(notify_pipe[1]); |