diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 16:11:59 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 16:11:59 +0000 |
| commit | 26881fb09f764edd0f7fc112afb7fd42b55f457d (patch) | |
| tree | 99e4a7f398bd4d2165ecca68134a947c8c1862bd | |
| parent | 0f6681e3c5494add35544b9250439a810bc045d6 (diff) | |
kill HAVE_CLOSEFROM
| -rw-r--r-- | sbin/isakmpd/isakmpd.c | 8 | ||||
| -rw-r--r-- | sbin/isakmpd/sysdep/openbsd/Makefile.sysdep | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c index 7b831eac63d..6e0279762ef 100644 --- a/sbin/isakmpd/isakmpd.c +++ b/sbin/isakmpd/isakmpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isakmpd.c,v 1.78 2005/04/08 15:47:24 deraadt Exp $ */ +/* $OpenBSD: isakmpd.c,v 1.79 2005/04/08 16:11:58 deraadt Exp $ */ /* $EOM: isakmpd.c,v 1.54 2000/10/05 09:28:22 niklas Exp $ */ /* @@ -389,13 +389,7 @@ main(int argc, char *argv[]) size_t mask_size; struct timeval tv, *timeout; -#if defined (HAVE_CLOSEFROM) && (!defined (OpenBSD) || (OpenBSD >= 200405)) closefrom(STDERR_FILENO + 1); -#else - m = getdtablesize(); - for (n = STDERR_FILENO + 1; n < m; n++) - (void) close(n); -#endif /* * Make sure init() won't alloc fd 0, 1 or 2, as daemon() will close diff --git a/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep b/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep index 3e48a3cd60f..10241eb8190 100644 --- a/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep +++ b/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sysdep,v 1.27 2005/04/08 16:11:11 deraadt Exp $ +# $OpenBSD: Makefile.sysdep,v 1.28 2005/04/08 16:11:58 deraadt Exp $ # $EOM: Makefile.sysdep,v 1.18 2001/01/26 10:55:22 niklas Exp $ # @@ -33,7 +33,6 @@ IPSEC_SRCS= pf_key_v2.c IPSEC_CFLAGS= -DUSE_PF_KEY_V2 -DUSE_DEFAULT_ROUTE CFLAGS+= -DHAVE_PCAP -CFLAGS+= -DHAVE_CLOSEFROM .ifdef FEATURES .if ${FEATURES:Mpolicy} == "policy" |