summaryrefslogtreecommitdiff
path: root/monitor.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 /monitor.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 'monitor.c')
-rw-r--r--monitor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c
index 29d987c70..732cb365d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.110 2010/09/09 10:45:45 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.111 2011/05/15 08:09:01 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>
@@ -1834,7 +1834,7 @@ mm_init_compression(struct mm_master *mm)
1834/* XXX */ 1834/* XXX */
1835 1835
1836#define FD_CLOSEONEXEC(x) do { \ 1836#define FD_CLOSEONEXEC(x) do { \
1837 if (fcntl(x, F_SETFD, 1) == -1) \ 1837 if (fcntl(x, F_SETFD, FD_CLOEXEC) == -1) \
1838 fatal("fcntl(%d, F_SETFD)", x); \ 1838 fatal("fcntl(%d, F_SETFD)", x); \
1839} while (0) 1839} while (0)
1840 1840