summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2012-12-04 02:24:45 +0000
committerderaadt <deraadt@openbsd.org>2012-12-04 02:24:45 +0000
commitf4faee9106dab4458d5d3326f876cd772c8e31da (patch)
treea76506f3551ac0d4cce29d6d01b3609d1b7647cc
parentBackout last. It breaks existing 'ifconfig down ; dhclient' usage. (diff)
downloadwireguard-openbsd-f4faee9106dab4458d5d3326f876cd772c8e31da.tar.xz
wireguard-openbsd-f4faee9106dab4458d5d3326f876cd772c8e31da.zip
remove some unnecessary sys/param.h inclusions
-rw-r--r--bin/chio/chio.c4
-rw-r--r--bin/chmod/chmod.c4
-rw-r--r--bin/csh/extern.h4
-rw-r--r--bin/csh/misc.c4
-rw-r--r--bin/pax/ar_io.c3
-rw-r--r--bin/pax/ar_subs.c3
-rw-r--r--bin/pax/buf_subs.c3
-rw-r--r--bin/pax/cache.c3
-rw-r--r--bin/pax/cpio.c3
-rw-r--r--bin/pax/ftree.c3
-rw-r--r--bin/pax/gen_subs.c3
-rw-r--r--bin/pax/options.c3
-rw-r--r--bin/pax/pat_rep.c3
-rw-r--r--bin/pax/pax.c6
-rw-r--r--bin/pax/sel_subs.c3
-rw-r--r--bin/pax/tables.c4
-rw-r--r--bin/pax/tar.c3
-rw-r--r--bin/pax/tty_subs.c3
-rw-r--r--bin/rcp/rcp.c3
-rw-r--r--bin/rmail/rmail.c4
-rw-r--r--bin/systrace/alias.c3
-rw-r--r--bin/systrace/filter.c3
-rw-r--r--bin/systrace/intercept-translate.c3
-rw-r--r--bin/systrace/intercept.c3
-rw-r--r--bin/systrace/policy.c3
-rw-r--r--bin/systrace/register.c3
-rw-r--r--bin/systrace/systrace.c3
-rw-r--r--libexec/comsat/comsat.c3
-rw-r--r--libexec/fingerd/fingerd.c3
-rw-r--r--libexec/ftpd/ftpd.c3
-rw-r--r--libexec/identd/identd.c3
-rw-r--r--libexec/login_chpass/login_chpass.c3
-rw-r--r--libexec/login_lchpass/login_lchpass.c3
-rw-r--r--libexec/login_radius/raddauth.c3
-rw-r--r--libexec/login_reject/login_reject.c3
-rw-r--r--libexec/login_tis/login_tis.c3
-rw-r--r--libexec/login_token/login_token.c3
-rw-r--r--libexec/login_token/token.c3
-rw-r--r--libexec/login_token/tokendb.c3
-rw-r--r--libexec/rpc.yppasswdd/yppasswdd_mkpw.c3
-rw-r--r--libexec/rshd/rshd.c3
-rw-r--r--libexec/spamd-setup/spamd-setup.c3
-rw-r--r--sbin/ifconfig/brconfig.c3
-rw-r--r--sbin/iked/chap_ms.c3
-rw-r--r--sbin/iked/util.c4
-rw-r--r--sbin/pdisk/convert.c2
-rw-r--r--sbin/pfctl/pfctl_parser.c4
-rw-r--r--sbin/pflogd/privsep_fdpass.c5
-rw-r--r--sbin/ping/ping.c4
-rw-r--r--sbin/ping6/ping6.c4
-rw-r--r--usr.bin/mandoc/manpath.c4
-rw-r--r--usr.bin/nc/atomicio.c4
-rw-r--r--usr.bin/sendbug/atomicio.c4
-rw-r--r--usr.bin/systat/pf.c3
54 files changed, 66 insertions, 113 deletions
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index b3d72fb8dd6..22132c431a6 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chio.c,v 1.23 2011/04/24 01:13:55 krw Exp $ */
+/* $OpenBSD: chio.c,v 1.24 2012/12/04 02:24:46 deraadt Exp $ */
/* $NetBSD: chio.c,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $ */
/*
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/mtio.h>
#include <sys/chio.h>
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index 5be7ce267cb..df30e703c9f 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chmod.c,v 1.27 2011/03/09 12:32:02 okan Exp $ */
+/* $OpenBSD: chmod.c,v 1.28 2012/12/04 02:24:46 deraadt Exp $ */
/* $NetBSD: chmod.c,v 1.12 1995/03/21 09:02:09 cgd Exp $ */
/*
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <sys/stat.h>
#include <err.h>
diff --git a/bin/csh/extern.h b/bin/csh/extern.h
index 39e38a79b45..abc3bd70710 100644
--- a/bin/csh/extern.h
+++ b/bin/csh/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.15 2005/12/11 02:41:01 deraadt Exp $ */
+/* $OpenBSD: extern.h,v 1.16 2012/12/04 02:24:46 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.8 1996/10/31 23:50:54 christos Exp $ */
/*-
@@ -32,8 +32,6 @@
* @(#)extern.h 8.1 (Berkeley) 5/31/93
*/
-#include <sys/cdefs.h>
-
/*
* csh.c
*/
diff --git a/bin/csh/misc.c b/bin/csh/misc.c
index f75cbfa8051..8fb3d8f0327 100644
--- a/bin/csh/misc.c
+++ b/bin/csh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.11 2009/10/27 23:59:21 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.12 2012/12/04 02:24:46 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/03/21 09:03:09 cgd Exp $ */
/*-
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdarg.h>
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index f230a9c8940..cfbbea514a6 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar_io.c,v 1.39 2009/10/27 23:59:22 deraadt Exp $ */
+/* $OpenBSD: ar_io.c,v 1.40 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $ */
/*-
@@ -39,7 +39,6 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/mtio.h>
-#include <sys/param.h>
#include <sys/wait.h>
#include <signal.h>
#include <string.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 5b5505a7e4e..11f437ebf65 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar_subs.c,v 1.33 2009/10/27 23:59:22 deraadt Exp $ */
+/* $OpenBSD: ar_subs.c,v 1.34 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <signal.h>
#include <string.h>
#include <stdio.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 2417233f8c1..d61043cc870 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf_subs.c,v 1.23 2009/12/22 12:09:36 jasper Exp $ */
+/* $OpenBSD: buf_subs.c,v 1.24 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 0e1b591ba31..3673ebb885f 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cache.c,v 1.19 2009/12/22 12:09:36 jasper Exp $ */
+/* $OpenBSD: cache.c,v 1.20 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: cache.c,v 1.4 1995/03/21 09:07:10 cgd Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <string.h>
#include <stdio.h>
#include <pwd.h>
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 1a46cb668a3..9aafdf9b566 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpio.c,v 1.19 2009/10/27 23:59:22 deraadt Exp $ */
+/* $OpenBSD: cpio.c,v 1.20 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: cpio.c,v 1.5 1995/03/21 09:07:13 cgd Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 415a4963452..969d92657f0 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftree.c,v 1.29 2009/10/27 23:59:22 deraadt Exp $ */
+/* $OpenBSD: ftree.c,v 1.30 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: ftree.c,v 1.4 1995/03/21 09:07:21 cgd Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 1c6f73ee57e..551f0307c7b 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gen_subs.c,v 1.20 2009/10/27 23:59:22 deraadt Exp $ */
+/* $OpenBSD: gen_subs.c,v 1.21 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: gen_subs.c,v 1.5 1995/03/21 09:07:26 cgd Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <stdio.h>
#include <tzfile.h>
#include <utmp.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index cc4a17cbe06..909a944ad5d 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.75 2012/03/04 04:05:15 fgsch Exp $ */
+/* $OpenBSD: options.c,v 1.76 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */
/*-
@@ -38,7 +38,6 @@
#include <sys/time.h>
#include <sys/stat.h>
#include <sys/mtio.h>
-#include <sys/param.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 118c30b19ca..7a435a6ea7b 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pat_rep.c,v 1.31 2009/10/27 23:59:22 deraadt Exp $ */
+/* $OpenBSD: pat_rep.c,v 1.32 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index ee56aba0e63..ea5bfeab99a 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pax.c,v 1.33 2012/04/19 04:26:46 deraadt Exp $ */
+/* $OpenBSD: pax.c,v 1.34 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $ */
/*-
@@ -34,9 +34,7 @@
* SUCH DAMAGE.
*/
-#include <stdio.h>
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/resource.h>
@@ -48,6 +46,8 @@
#include <err.h>
#include <fcntl.h>
#include <paths.h>
+#include <stdio.h>
+
#include "pax.h"
#include "extern.h"
static int gen_init(void);
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 8f21814402b..6327bafb25e 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sel_subs.c,v 1.20 2009/11/12 20:17:03 deraadt Exp $ */
+/* $OpenBSD: sel_subs.c,v 1.21 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <ctype.h>
#include <grp.h>
#include <pwd.h>
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 50bd89b53ec..cfbf4a55c30 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tables.c,v 1.26 2009/10/27 23:59:22 deraadt Exp $ */
+/* $OpenBSD: tables.c,v 1.27 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $ */
/*-
@@ -35,9 +35,9 @@
*/
#include <sys/types.h>
+#include <sys/param.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <sys/fcntl.h>
#include <stdio.h>
#include <string.h>
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index 313b542e219..3cabd38691d 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tar.c,v 1.43 2010/12/02 04:08:27 tedu Exp $ */
+/* $OpenBSD: tar.c,v 1.44 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index e63a221cba4..a01e2919117 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty_subs.c,v 1.14 2009/10/27 23:59:22 deraadt Exp $ */
+/* $OpenBSD: tty_subs.c,v 1.15 2012/12/04 02:24:45 deraadt Exp $ */
/* $NetBSD: tty_subs.c,v 1.5 1995/03/21 09:07:52 cgd Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <fcntl.h>
#include <stdio.h>
#include <errno.h>
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index b62ca1fb18c..9cbf696e59b 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcp.c,v 1.49 2009/10/27 23:59:22 deraadt Exp $ */
+/* $OpenBSD: rcp.c,v 1.50 2012/12/04 02:24:46 deraadt Exp $ */
/* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */
/*
@@ -30,7 +30,6 @@
* SUCH DAMAGE.
*/
-#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c
index 841cceca45c..0a77aa15379 100644
--- a/bin/rmail/rmail.c
+++ b/bin/rmail/rmail.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmail.c,v 1.24 2009/10/27 23:59:22 deraadt Exp $ */
+/* $OpenBSD: rmail.c,v 1.25 2012/12/04 02:24:47 deraadt Exp $ */
/* $NetBSD: rmail.c,v 1.8 1995/09/07 06:51:50 jtc Exp $ */
/*
@@ -51,7 +51,7 @@
* The output of rmail(8) compresses the <forward> lines into a single
* from path.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/bin/systrace/alias.c b/bin/systrace/alias.c
index d319c5de380..00ce07b5062 100644
--- a/bin/systrace/alias.c
+++ b/bin/systrace/alias.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: alias.c,v 1.5 2002/09/06 22:56:21 deraadt Exp $ */
+/* $OpenBSD: alias.c,v 1.6 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -30,7 +30,6 @@
*/
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/stat.h>
#include <sys/tree.h>
#include <limits.h>
diff --git a/bin/systrace/filter.c b/bin/systrace/filter.c
index 576b848af2d..ba366946c38 100644
--- a/bin/systrace/filter.c
+++ b/bin/systrace/filter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: filter.c,v 1.33 2006/07/02 12:34:15 sturm Exp $ */
+/* $OpenBSD: filter.c,v 1.34 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -29,7 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/param.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/tree.h>
diff --git a/bin/systrace/intercept-translate.c b/bin/systrace/intercept-translate.c
index 6f6d8ad9ae5..b6e43e54d5d 100644
--- a/bin/systrace/intercept-translate.c
+++ b/bin/systrace/intercept-translate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intercept-translate.c,v 1.15 2012/03/02 17:23:08 matthew Exp $ */
+/* $OpenBSD: intercept-translate.c,v 1.16 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -30,7 +30,6 @@
*/
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/tree.h>
#include <sys/socket.h>
#include <fcntl.h>
diff --git a/bin/systrace/intercept.c b/bin/systrace/intercept.c
index 3dfb223b716..e4c768730cd 100644
--- a/bin/systrace/intercept.c
+++ b/bin/systrace/intercept.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intercept.c,v 1.59 2012/08/23 00:08:36 guenther Exp $ */
+/* $OpenBSD: intercept.c,v 1.60 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -31,7 +31,6 @@
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/tree.h>
#include <sys/wait.h>
#include <sys/stat.h>
diff --git a/bin/systrace/policy.c b/bin/systrace/policy.c
index 2afcc5b964a..09a720746a3 100644
--- a/bin/systrace/policy.c
+++ b/bin/systrace/policy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: policy.c,v 1.32 2006/09/19 10:48:41 otto Exp $ */
+/* $OpenBSD: policy.c,v 1.33 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -30,7 +30,6 @@
*/
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/stat.h>
#include <sys/tree.h>
#include <dirent.h>
diff --git a/bin/systrace/register.c b/bin/systrace/register.c
index 1d68d06c513..6f8d0cc640a 100644
--- a/bin/systrace/register.c
+++ b/bin/systrace/register.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: register.c,v 1.23 2011/09/18 23:24:14 matthew Exp $ */
+/* $OpenBSD: register.c,v 1.24 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -30,7 +30,6 @@
*/
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/tree.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/bin/systrace/systrace.c b/bin/systrace/systrace.c
index 2395e04b07a..80a3fa4a96d 100644
--- a/bin/systrace/systrace.c
+++ b/bin/systrace/systrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: systrace.c,v 1.57 2012/08/23 00:08:36 guenther Exp $ */
+/* $OpenBSD: systrace.c,v 1.58 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -30,7 +30,6 @@
*/
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/wait.h>
#include <sys/tree.h>
#include <sys/socket.h>
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index eb2e1b49e87..0e4b0a5cc22 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: comsat.c,v 1.36 2009/10/27 23:59:31 deraadt Exp $ */
+/* $OpenBSD: comsat.c,v 1.37 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -30,7 +30,6 @@
*/
#include <sys/limits.h>
-#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index d4f9ce68acb..5d44b3f6dae 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fingerd.c,v 1.35 2009/10/27 23:59:31 deraadt Exp $ */
+/* $OpenBSD: fingerd.c,v 1.36 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 760dd253d35..43dca2743b7 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftpd.c,v 1.195 2012/03/04 04:05:15 fgsch Exp $ */
+/* $OpenBSD: ftpd.c,v 1.196 2012/12/04 02:24:47 deraadt Exp $ */
/* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */
/*
@@ -62,7 +62,6 @@
/*
* FTP server.
*/
-#include <sys/param.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/libexec/identd/identd.c b/libexec/identd/identd.c
index 37e8351c885..875baf174c2 100644
--- a/libexec/identd/identd.c
+++ b/libexec/identd/identd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: identd.c,v 1.49 2010/06/06 07:05:40 jmc Exp $ */
+/* $OpenBSD: identd.c,v 1.50 2012/12/04 02:24:47 deraadt Exp $ */
/*
* This program is in the public domain and may be used freely by anyone
@@ -8,7 +8,6 @@
*/
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/file.h>
diff --git a/libexec/login_chpass/login_chpass.c b/libexec/login_chpass/login_chpass.c
index 2d665d5fa14..903ca333a28 100644
--- a/libexec/login_chpass/login_chpass.c
+++ b/libexec/login_chpass/login_chpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_chpass.c,v 1.15 2006/03/09 19:14:09 millert Exp $ */
+/* $OpenBSD: login_chpass.c,v 1.16 2012/12/04 02:24:47 deraadt Exp $ */
/*-
* Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved.
@@ -33,7 +33,6 @@
*
* BSDI $From: login_chpass.c,v 1.3 1996/08/21 21:01:48 prb Exp $
*/
-#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/libexec/login_lchpass/login_lchpass.c b/libexec/login_lchpass/login_lchpass.c
index 7d0a429b20a..6696067d38a 100644
--- a/libexec/login_lchpass/login_lchpass.c
+++ b/libexec/login_lchpass/login_lchpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_lchpass.c,v 1.13 2006/03/09 19:14:10 millert Exp $ */
+/* $OpenBSD: login_lchpass.c,v 1.14 2012/12/04 02:24:47 deraadt Exp $ */
/*-
* Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved.
@@ -33,7 +33,6 @@
*
* BSDI $From: login_lchpass.c,v 1.4 1997/08/08 18:58:23 prb Exp $
*/
-#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/libexec/login_radius/raddauth.c b/libexec/login_radius/raddauth.c
index 65975234bb4..331bc567959 100644
--- a/libexec/login_radius/raddauth.c
+++ b/libexec/login_radius/raddauth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raddauth.c,v 1.23 2007/12/14 14:23:25 millert Exp $ */
+/* $OpenBSD: raddauth.c,v 1.24 2012/12/04 02:24:47 deraadt Exp $ */
/*-
* Copyright (c) 1996, 1997 Berkeley Software Design, Inc. All rights reserved.
@@ -66,7 +66,6 @@
*/
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/libexec/login_reject/login_reject.c b/libexec/login_reject/login_reject.c
index 5f264b08bc6..0c99873b884 100644
--- a/libexec/login_reject/login_reject.c
+++ b/libexec/login_reject/login_reject.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_reject.c,v 1.8 2006/04/02 04:14:49 deraadt Exp $ */
+/* $OpenBSD: login_reject.c,v 1.9 2012/12/04 02:24:47 deraadt Exp $ */
/*-
* Copyright (c) 1995 Berkeley Software Design, Inc. All rights reserved.
@@ -33,7 +33,6 @@
*
* BSDI $From: login_reject.c,v 1.5 1996/08/22 20:43:11 prb Exp $
*/
-#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/libexec/login_tis/login_tis.c b/libexec/login_tis/login_tis.c
index d3f9569e3e2..7bd493cde60 100644
--- a/libexec/login_tis/login_tis.c
+++ b/libexec/login_tis/login_tis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_tis.c,v 1.10 2010/10/15 10:18:42 jsg Exp $ */
+/* $OpenBSD: login_tis.c,v 1.11 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright (c) 2004 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,7 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/libexec/login_token/login_token.c b/libexec/login_token/login_token.c
index 668a3b0fc02..056c9125d6f 100644
--- a/libexec/login_token/login_token.c
+++ b/libexec/login_token/login_token.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_token.c,v 1.8 2004/03/10 21:30:27 millert Exp $ */
+/* $OpenBSD: login_token.c,v 1.9 2012/12/04 02:24:47 deraadt Exp $ */
/*-
* Copyright (c) 1995, 1996 Berkeley Software Design, Inc. All rights reserved.
@@ -35,7 +35,6 @@
*/
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/libexec/login_token/token.c b/libexec/login_token/token.c
index f08585e3829..f760395ba94 100644
--- a/libexec/login_token/token.c
+++ b/libexec/login_token/token.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: token.c,v 1.12 2010/10/15 10:18:42 jsg Exp $ */
+/* $OpenBSD: token.c,v 1.13 2012/12/04 02:24:47 deraadt Exp $ */
/*-
* Copyright (c) 1995 Migration Associates Corp. All Rights Reserved
@@ -40,7 +40,6 @@
*/
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/libexec/login_token/tokendb.c b/libexec/login_token/tokendb.c
index def4135df74..23a82c28a19 100644
--- a/libexec/login_token/tokendb.c
+++ b/libexec/login_token/tokendb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tokendb.c,v 1.8 2005/09/16 23:47:00 deraadt Exp $ */
+/* $OpenBSD: tokendb.c,v 1.9 2012/12/04 02:24:47 deraadt Exp $ */
/*-
* Copyright (c) 1995 Migration Associates Corp. All Rights Reserved
@@ -36,7 +36,6 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/libexec/rpc.yppasswdd/yppasswdd_mkpw.c b/libexec/rpc.yppasswdd/yppasswdd_mkpw.c
index e98cab85c53..0d3220ab055 100644
--- a/libexec/rpc.yppasswdd/yppasswdd_mkpw.c
+++ b/libexec/rpc.yppasswdd/yppasswdd_mkpw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yppasswdd_mkpw.c,v 1.29 2009/10/27 23:59:31 deraadt Exp $ */
+/* $OpenBSD: yppasswdd_mkpw.c,v 1.30 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index ddd005a8478..bc9972da728 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rshd.c,v 1.53 2009/10/27 23:59:31 deraadt Exp $ */
+/* $OpenBSD: rshd.c,v 1.54 2012/12/04 02:24:47 deraadt Exp $ */
/*-
* Copyright (c) 1988, 1989, 1992, 1993, 1994
@@ -37,7 +37,6 @@
* command\0
* data
*/
-#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/libexec/spamd-setup/spamd-setup.c b/libexec/spamd-setup/spamd-setup.c
index ee794e76e97..f2166e25041 100644
--- a/libexec/spamd-setup/spamd-setup.c
+++ b/libexec/spamd-setup/spamd-setup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spamd-setup.c,v 1.37 2009/09/09 16:05:55 claudio Exp $ */
+/* $OpenBSD: spamd-setup.c,v 1.38 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright (c) 2003 Bob Beck. All rights reserved.
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/sbin/ifconfig/brconfig.c b/sbin/ifconfig/brconfig.c
index 2b5f607054e..936faf3b1be 100644
--- a/sbin/ifconfig/brconfig.c
+++ b/sbin/ifconfig/brconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: brconfig.c,v 1.4 2012/11/30 18:06:11 gsoares Exp $ */
+/* $OpenBSD: brconfig.c,v 1.5 2012/12/04 02:24:46 deraadt Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -33,7 +33,6 @@
#include <sys/stdint.h>
#include <unistd.h>
#include <stdlib.h>
-#include <sys/param.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <net/if.h>
diff --git a/sbin/iked/chap_ms.c b/sbin/iked/chap_ms.c
index ed5a0e2fad5..fea9960ac4c 100644
--- a/sbin/iked/chap_ms.c
+++ b/sbin/iked/chap_ms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chap_ms.c,v 1.3 2012/09/18 12:07:59 reyk Exp $ */
+/* $OpenBSD: chap_ms.c,v 1.4 2012/12/04 02:24:47 deraadt Exp $ */
/* $vantronix: chap_ms.c,v 1.7 2010/06/02 12:22:58 reyk Exp $ */
/*
@@ -32,7 +32,6 @@
*/
#include <sys/types.h>
-#include <sys/cdefs.h>
#include <ctype.h>
#include <string.h>
diff --git a/sbin/iked/util.c b/sbin/iked/util.c
index 98514cf6899..8cad9a023c0 100644
--- a/sbin/iked/util.c
+++ b/sbin/iked/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.16 2012/09/18 12:07:59 reyk Exp $ */
+/* $OpenBSD: util.c,v 1.17 2012/12/04 02:24:47 deraadt Exp $ */
/* $vantronix: util.c,v 1.39 2010/06/02 12:22:58 reyk Exp $ */
/*
@@ -17,7 +17,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/uio.h>
diff --git a/sbin/pdisk/convert.c b/sbin/pdisk/convert.c
index 682fc19f48d..10ad7f98bb7 100644
--- a/sbin/pdisk/convert.c
+++ b/sbin/pdisk/convert.c
@@ -27,7 +27,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <machine/endian.h>
#include "convert.h"
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index 5b81642b5e8..c21dec4ac43 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfctl_parser.c,v 1.290 2012/09/18 10:11:53 henning Exp $ */
+/* $OpenBSD: pfctl_parser.c,v 1.291 2012/12/04 02:24:46 deraadt Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -34,8 +34,6 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include <sys/param.h>
-#include <sys/proc.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
diff --git a/sbin/pflogd/privsep_fdpass.c b/sbin/pflogd/privsep_fdpass.c
index ad618616ed9..45a7cfc3a92 100644
--- a/sbin/pflogd/privsep_fdpass.c
+++ b/sbin/pflogd/privsep_fdpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: privsep_fdpass.c,v 1.6 2012/04/04 17:24:50 deraadt Exp $ */
+/* $OpenBSD: privsep_fdpass.c,v 1.7 2012/12/04 02:24:46 deraadt Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -31,7 +31,8 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/param.h>
+
+#include <sys/types.h>
#include <sys/uio.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 5bef1fcf3e9..9ef5d260360 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping.c,v 1.92 2012/03/17 10:16:40 dlg Exp $ */
+/* $OpenBSD: ping.c,v 1.93 2012/12/04 02:24:47 deraadt Exp $ */
/* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */
/*
@@ -51,7 +51,7 @@
* This program has to run SUID to ROOT to access the ICMP socket.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/file.h>
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 36516c8ddc7..e52a21e21b8 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping6.c,v 1.81 2011/03/03 00:30:31 mikeb Exp $ */
+/* $OpenBSD: ping6.c,v 1.82 2012/12/04 02:24:47 deraadt Exp $ */
/* $KAME: ping6.c,v 1.163 2002/10/25 02:19:06 itojun Exp $ */
/*
@@ -80,7 +80,7 @@
* This program has to run SUID to ROOT to access the ICMP socket.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <sys/uio.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/usr.bin/mandoc/manpath.c b/usr.bin/mandoc/manpath.c
index 97364893a5a..5dfdc681e22 100644
--- a/usr.bin/mandoc/manpath.c
+++ b/usr.bin/mandoc/manpath.c
@@ -1,4 +1,4 @@
-/* $Id: manpath.c,v 1.4 2011/12/24 21:51:40 schwarze Exp $ */
+/* $Id: manpath.c,v 1.5 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -16,8 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/param.h>
-
#include <assert.h>
#include <ctype.h>
#include <limits.h>
diff --git a/usr.bin/nc/atomicio.c b/usr.bin/nc/atomicio.c
index feb6f194409..344ac63ab9e 100644
--- a/usr.bin/nc/atomicio.c
+++ b/usr.bin/nc/atomicio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atomicio.c,v 1.10 2011/01/08 00:47:19 jeremy Exp $ */
+/* $OpenBSD: atomicio.c,v 1.11 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright (c) 2006 Damien Miller. All rights reserved.
* Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/param.h>
-
#include <errno.h>
#include <poll.h>
#include <unistd.h>
diff --git a/usr.bin/sendbug/atomicio.c b/usr.bin/sendbug/atomicio.c
index f85dec49b9b..0c74cd8684b 100644
--- a/usr.bin/sendbug/atomicio.c
+++ b/usr.bin/sendbug/atomicio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atomicio.c,v 1.3 2007/09/07 14:50:44 tobias Exp $ */
+/* $OpenBSD: atomicio.c,v 1.4 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright (c) 2006 Damien Miller. All rights reserved.
* Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@@ -26,8 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/param.h>
-
#include <errno.h>
#include <poll.h>
#include <unistd.h>
diff --git a/usr.bin/systat/pf.c b/usr.bin/systat/pf.c
index f51c8a7dc9f..520a1c47ecb 100644
--- a/usr.bin/systat/pf.c
+++ b/usr.bin/systat/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.4 2011/03/02 06:48:17 jasper Exp $ */
+/* $OpenBSD: pf.c,v 1.5 2012/12/04 02:24:47 deraadt Exp $ */
/*
* Copyright (c) 2001, 2007 Can Erkin Acar <canacar@openbsd.org>
*
@@ -18,7 +18,6 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include <sys/param.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>