summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2013-03-21 04:30:15 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2013-03-21 04:30:15 +0000
commit58df33a7a6c5d7ffd49bd390800651664a203c43 (patch)
treea09597e236bf59a986cda2645d5febeee8a11b3a /sbin
parent9f521bcbcb5109a73d6da1e9d73b8fbdcad17174 (diff)
remove excessive includes
Diffstat (limited to 'sbin')
-rw-r--r--sbin/iked/ca.c3
-rw-r--r--sbin/iked/config.c3
-rw-r--r--sbin/iked/control.c3
-rw-r--r--sbin/iked/eap.c3
-rw-r--r--sbin/iked/iked.c3
-rw-r--r--sbin/iked/ikev1.c3
-rw-r--r--sbin/iked/ikev2.c3
-rw-r--r--sbin/iked/ikev2_msg.c3
-rw-r--r--sbin/iked/ikev2_pld.c3
-rw-r--r--sbin/iked/imsg_util.c3
-rw-r--r--sbin/iked/parse.y3
-rw-r--r--sbin/iked/pfkey.c3
-rw-r--r--sbin/iked/proc.c5
-rw-r--r--sbin/isakmpd/cert.c4
-rw-r--r--sbin/isakmpd/conf.c4
-rw-r--r--sbin/isakmpd/crypto.c4
-rw-r--r--sbin/isakmpd/doi.c4
-rw-r--r--sbin/isakmpd/hash.c4
-rw-r--r--sbin/isakmpd/isakmpd.c3
-rw-r--r--sbin/isakmpd/policy.c3
-rw-r--r--sbin/isakmpd/prf.c3
-rw-r--r--sbin/isakmpd/transport.c3
22 files changed, 28 insertions, 45 deletions
diff --git a/sbin/iked/ca.c b/sbin/iked/ca.c
index 2b5d6e3c891..d3599994bf6 100644
--- a/sbin/iked/ca.c
+++ b/sbin/iked/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.21 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: ca.c,v 1.22 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -17,7 +17,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/wait.h>
diff --git a/sbin/iked/config.c b/sbin/iked/config.c
index 1e31083381e..f7806f7fcfa 100644
--- a/sbin/iked/config.c
+++ b/sbin/iked/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.19 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: config.c,v 1.20 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -17,7 +17,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/queue.h>
#include <sys/wait.h>
#include <sys/socket.h>
diff --git a/sbin/iked/control.c b/sbin/iked/control.c
index b9d71f499f3..2793b89a45e 100644
--- a/sbin/iked/control.c
+++ b/sbin/iked/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.11 2013/03/11 17:40:10 deraadt Exp $ */
+/* $OpenBSD: control.c,v 1.12 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -19,7 +19,6 @@
#include <sys/queue.h>
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/sbin/iked/eap.c b/sbin/iked/eap.c
index 8f85c158ea9..b41cfe0e5cc 100644
--- a/sbin/iked/eap.c
+++ b/sbin/iked/eap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eap.c,v 1.8 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: eap.c,v 1.9 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -17,7 +17,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/wait.h>
diff --git a/sbin/iked/iked.c b/sbin/iked/iked.c
index b897080680b..d2d6714dfa3 100644
--- a/sbin/iked/iked.c
+++ b/sbin/iked/iked.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iked.c,v 1.16 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: iked.c,v 1.17 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -17,7 +17,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/wait.h>
diff --git a/sbin/iked/ikev1.c b/sbin/iked/ikev1.c
index cbac04699f4..eec134d73d3 100644
--- a/sbin/iked/ikev1.c
+++ b/sbin/iked/ikev1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ikev1.c,v 1.12 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: ikev1.c,v 1.13 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -23,7 +23,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/wait.h>
diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c
index 0be8fffad6a..5f5433b4cd4 100644
--- a/sbin/iked/ikev2.c
+++ b/sbin/iked/ikev2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ikev2.c,v 1.81 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: ikev2.c,v 1.82 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -17,7 +17,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/wait.h>
diff --git a/sbin/iked/ikev2_msg.c b/sbin/iked/ikev2_msg.c
index 63c8473e5a1..cfcaf4c0ca5 100644
--- a/sbin/iked/ikev2_msg.c
+++ b/sbin/iked/ikev2_msg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ikev2_msg.c,v 1.24 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: ikev2_msg.c,v 1.25 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -17,7 +17,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/wait.h>
diff --git a/sbin/iked/ikev2_pld.c b/sbin/iked/ikev2_pld.c
index de51de64227..96654f067eb 100644
--- a/sbin/iked/ikev2_pld.c
+++ b/sbin/iked/ikev2_pld.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ikev2_pld.c,v 1.30 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: ikev2_pld.c,v 1.31 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -17,7 +17,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/wait.h>
diff --git a/sbin/iked/imsg_util.c b/sbin/iked/imsg_util.c
index c585e245435..0551c09d8a3 100644
--- a/sbin/iked/imsg_util.c
+++ b/sbin/iked/imsg_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imsg_util.c,v 1.6 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: imsg_util.c,v 1.7 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -16,7 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/param.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/uio.h>
diff --git a/sbin/iked/parse.y b/sbin/iked/parse.y
index 23c57bb8ebf..83b6d318442 100644
--- a/sbin/iked/parse.y
+++ b/sbin/iked/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.29 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: parse.y,v 1.30 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -22,7 +22,6 @@
*/
%{
-#include <sys/param.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/queue.h>
diff --git a/sbin/iked/pfkey.c b/sbin/iked/pfkey.c
index fe9b9d7b23c..0944f562fc9 100644
--- a/sbin/iked/pfkey.c
+++ b/sbin/iked/pfkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkey.c,v 1.22 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: pfkey.c,v 1.23 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -19,7 +19,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/uio.h>
diff --git a/sbin/iked/proc.c b/sbin/iked/proc.c
index 835e6ee01d6..d8c02fd031d 100644
--- a/sbin/iked/proc.c
+++ b/sbin/iked/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.8 2013/01/08 10:38:19 reyk Exp $ */
+/* $OpenBSD: proc.c,v 1.9 2013/03/21 04:30:14 deraadt Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -17,10 +17,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
+#include <sys/param.h>
#include <sys/queue.h>
#include <sys/tree.h>
-#include <sys/param.h>
#include <sys/wait.h>
#include <sys/socket.h>
diff --git a/sbin/isakmpd/cert.c b/sbin/isakmpd/cert.c
index d534336dc34..2803a958f35 100644
--- a/sbin/isakmpd/cert.c
+++ b/sbin/isakmpd/cert.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cert.c,v 1.32 2007/08/05 09:43:09 tom Exp $ */
+/* $OpenBSD: cert.c,v 1.33 2013/03/21 04:30:14 deraadt Exp $ */
/* $EOM: cert.c,v 1.18 2000/09/28 12:53:27 niklas Exp $ */
/*
@@ -30,7 +30,7 @@
* This code was written under funding by Ericsson Radio Systems.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c
index bf1a55abc49..c4526d2ef17 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.101 2012/07/13 15:16:18 mikeb Exp $ */
+/* $OpenBSD: conf.c,v 1.102 2013/03/21 04:30:14 deraadt Exp $ */
/* $EOM: conf.c,v 1.48 2000/12/04 02:04:29 angelos Exp $ */
/*
@@ -30,7 +30,7 @@
* This code was written under funding by Ericsson Radio Systems.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <sys/mman.h>
#include <sys/queue.h>
#include <sys/socket.h>
diff --git a/sbin/isakmpd/crypto.c b/sbin/isakmpd/crypto.c
index 9574a491351..d10dd508e42 100644
--- a/sbin/isakmpd/crypto.c
+++ b/sbin/isakmpd/crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypto.c,v 1.31 2010/10/19 07:47:34 mikeb Exp $ */
+/* $OpenBSD: crypto.c,v 1.32 2013/03/21 04:30:14 deraadt Exp $ */
/* $EOM: crypto.c,v 1.32 2000/03/07 20:08:51 niklas Exp $ */
/*
@@ -30,7 +30,7 @@
* This code was written under funding by Ericsson Radio Systems.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sbin/isakmpd/doi.c b/sbin/isakmpd/doi.c
index c1c6f45a6e3..e9237092a0c 100644
--- a/sbin/isakmpd/doi.c
+++ b/sbin/isakmpd/doi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doi.c,v 1.10 2005/04/08 22:32:09 cloder Exp $ */
+/* $OpenBSD: doi.c,v 1.11 2013/03/21 04:30:14 deraadt Exp $ */
/* $EOM: doi.c,v 1.4 1999/04/02 00:57:36 niklas Exp $ */
/*
@@ -29,7 +29,7 @@
* This code was written under funding by Ericsson Radio Systems.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include "doi.h"
diff --git a/sbin/isakmpd/hash.c b/sbin/isakmpd/hash.c
index 76c2f19783f..aa8de2afb6a 100644
--- a/sbin/isakmpd/hash.c
+++ b/sbin/isakmpd/hash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hash.c,v 1.22 2008/09/06 12:01:34 djm Exp $ */
+/* $OpenBSD: hash.c,v 1.23 2013/03/21 04:30:14 deraadt Exp $ */
/* $EOM: hash.c,v 1.10 1999/04/17 23:20:34 niklas Exp $ */
/*
@@ -30,7 +30,7 @@
* This code was written under funding by Ericsson Radio Systems.
*/
-#include <sys/param.h>
+#include <sys/types.h>
#include <string.h>
#include <md5.h>
#include <sha1.h>
diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c
index c21a7b1a56d..76980e03b99 100644
--- a/sbin/isakmpd/isakmpd.c
+++ b/sbin/isakmpd/isakmpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isakmpd.c,v 1.98 2010/04/15 07:51:17 lum Exp $ */
+/* $OpenBSD: isakmpd.c,v 1.99 2013/03/21 04:30:14 deraadt Exp $ */
/* $EOM: isakmpd.c,v 1.54 2000/10/05 09:28:22 niklas Exp $ */
/*
@@ -32,7 +32,6 @@
*/
#include <errno.h>
-#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <signal.h>
diff --git a/sbin/isakmpd/policy.c b/sbin/isakmpd/policy.c
index 76650d04a45..83c44f5687b 100644
--- a/sbin/isakmpd/policy.c
+++ b/sbin/isakmpd/policy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: policy.c,v 1.94 2012/06/30 14:51:31 naddy Exp $ */
+/* $OpenBSD: policy.c,v 1.95 2013/03/21 04:30:14 deraadt Exp $ */
/* $EOM: policy.c,v 1.49 2000/10/24 13:33:39 niklas Exp $ */
/*
@@ -32,7 +32,6 @@
*/
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/mman.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/sbin/isakmpd/prf.c b/sbin/isakmpd/prf.c
index ba23568d2c7..8df6f73883a 100644
--- a/sbin/isakmpd/prf.c
+++ b/sbin/isakmpd/prf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prf.c,v 1.15 2005/04/08 22:32:10 cloder Exp $ */
+/* $OpenBSD: prf.c,v 1.16 2013/03/21 04:30:14 deraadt Exp $ */
/* $EOM: prf.c,v 1.7 1999/05/02 12:50:29 niklas Exp $ */
/*
@@ -30,7 +30,6 @@
* This code was written under funding by Ericsson Radio Systems.
*/
-#include <sys/param.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sbin/isakmpd/transport.c b/sbin/isakmpd/transport.c
index b1cd1b96890..71956c06a99 100644
--- a/sbin/isakmpd/transport.c
+++ b/sbin/isakmpd/transport.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: transport.c,v 1.35 2005/12/28 10:57:35 hshoexer Exp $ */
+/* $OpenBSD: transport.c,v 1.36 2013/03/21 04:30:14 deraadt Exp $ */
/* $EOM: transport.c,v 1.43 2000/10/10 12:36:39 provos Exp $ */
/*
@@ -30,7 +30,6 @@
* This code was written under funding by Ericsson Radio Systems.
*/
-#include <sys/param.h>
#include <sys/queue.h>
#include <netdb.h>
#include <string.h>