summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-20 19:02:47 +1000
committerDamien Miller <djm@mindrot.org>2011-05-20 19:02:47 +1000
commit814ace08751a80c3b965c06fdfc1c9ac3d7698ca (patch)
tree5cc0a8c1ecc49fc882a950d9b647f7c1d060d7b6 /serverloop.c
parentec2eaa3daf7f5543d8619cec30c1d73268323d01 (diff)
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2011/05/15 08:09:01 [authfd.c monitor.c serverloop.c] use FD_CLOEXEC consistently; patch from zion AT x96.org
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c6
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]);