diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-11-24 17:07:29 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-11-24 17:07:29 +0000 |
| commit | 1e4c54457c1564750abf461e0fd7d80673ec715c (patch) | |
| tree | da04e28e8acc13b5f8c2daedf8d331d29fe8274c /usr.sbin | |
| parent | 92965fe426af64c9ea720b8582d20773348e2529 (diff) | |
sort includes, adjust to style(9)
Diffstat (limited to 'usr.sbin')
34 files changed, 106 insertions, 106 deletions
diff --git a/usr.sbin/hoststated/buffer.c b/usr.sbin/hoststated/buffer.c index cb61f4c5271..5b3cba8e544 100644 --- a/usr.sbin/hoststated/buffer.c +++ b/usr.sbin/hoststated/buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer.c,v 1.7 2007/06/12 15:16:10 msf Exp $ */ +/* $OpenBSD: buffer.c,v 1.8 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -16,12 +16,13 @@ * 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/socket.h> #include <sys/uio.h> -#include <sys/param.h> + #include <net/if.h> + #include <errno.h> #include <event.h> #include <limits.h> diff --git a/usr.sbin/hoststated/carp.c b/usr.sbin/hoststated/carp.c index 6acdeb6efc7..4288b01b513 100644 --- a/usr.sbin/hoststated/carp.c +++ b/usr.sbin/hoststated/carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: carp.c,v 1.3 2007/02/26 16:10:24 reyk Exp $ */ +/* $OpenBSD: carp.c,v 1.4 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Henning Brauer <henning@openbsd.org> @@ -16,10 +16,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/types.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/ioctl.h> -#include <sys/param.h> + #include <net/if.h> #include <errno.h> diff --git a/usr.sbin/hoststated/check_icmp.c b/usr.sbin/hoststated/check_icmp.c index 2f54a08e0df..25dc21f2117 100644 --- a/usr.sbin/hoststated/check_icmp.c +++ b/usr.sbin/hoststated/check_icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_icmp.c,v 1.20 2007/10/09 05:38:58 pyr Exp $ */ +/* $OpenBSD: check_icmp.c,v 1.21 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -19,14 +19,15 @@ #include <sys/types.h> #include <sys/queue.h> #include <sys/socket.h> -#include <sys/param.h> + +#include <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> #include <netinet/icmp6.h> -#include <net/if.h> #include <arpa/inet.h> + #include <limits.h> #include <event.h> #include <errno.h> diff --git a/usr.sbin/hoststated/check_script.c b/usr.sbin/hoststated/check_script.c index 3d050d95058..2f09c2543a3 100644 --- a/usr.sbin/hoststated/check_script.c +++ b/usr.sbin/hoststated/check_script.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_script.c,v 1.3 2007/10/13 17:50:05 deraadt Exp $ */ +/* $OpenBSD: check_script.c,v 1.4 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org> @@ -16,11 +16,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/socket.h> -#include <sys/param.h> -#include <sys/types.h> #include <sys/wait.h> #include <net/if.h> diff --git a/usr.sbin/hoststated/check_tcp.c b/usr.sbin/hoststated/check_tcp.c index ae168bd02da..d039a1d1335 100644 --- a/usr.sbin/hoststated/check_tcp.c +++ b/usr.sbin/hoststated/check_tcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_tcp.c,v 1.29 2007/11/21 20:13:20 reyk Exp $ */ +/* $OpenBSD: check_tcp.c,v 1.30 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -16,13 +16,12 @@ * 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/socket.h> -#include <sys/param.h> -#include <netinet/in.h> #include <net/if.h> +#include <netinet/in.h> #include <limits.h> #include <event.h> diff --git a/usr.sbin/hoststated/control.c b/usr.sbin/hoststated/control.c index 22aa3384a00..97597dd8489 100644 --- a/usr.sbin/hoststated/control.c +++ b/usr.sbin/hoststated/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.20 2007/11/19 15:31:36 reyk Exp $ */ +/* $OpenBSD: control.c,v 1.21 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -18,11 +18,12 @@ #include <sys/queue.h> #include <sys/param.h> -#include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> #include <sys/un.h> + #include <net/if.h> + #include <errno.h> #include <event.h> #include <fcntl.h> diff --git a/usr.sbin/hoststated/hce.c b/usr.sbin/hoststated/hce.c index c24278196c5..cb3240f52da 100644 --- a/usr.sbin/hoststated/hce.c +++ b/usr.sbin/hoststated/hce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hce.c,v 1.35 2007/11/21 09:54:39 pyr Exp $ */ +/* $OpenBSD: hce.c,v 1.36 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -16,17 +16,18 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/queue.h> #include <sys/param.h> -#include <sys/types.h> +#include <sys/queue.h> #include <sys/time.h> #include <sys/stat.h> #include <sys/socket.h> #include <sys/un.h> + +#include <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> -#include <net/if.h> + #include <errno.h> #include <event.h> #include <fcntl.h> diff --git a/usr.sbin/hoststated/hoststated.c b/usr.sbin/hoststated/hoststated.c index 5f640876d3e..674b8660083 100644 --- a/usr.sbin/hoststated/hoststated.c +++ b/usr.sbin/hoststated/hoststated.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hoststated.c,v 1.58 2007/11/24 16:13:50 reyk Exp $ */ +/* $OpenBSD: hoststated.c,v 1.59 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -19,11 +19,12 @@ #include <sys/types.h> #include <sys/queue.h> #include <sys/socket.h> -#include <sys/param.h> #include <sys/wait.h> + #include <net/if.h> #include <netinet/in.h> #include <arpa/inet.h> + #include <string.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr.sbin/hoststated/imsg.c b/usr.sbin/hoststated/imsg.c index 1a58a10c1e9..bac50e2007a 100644 --- a/usr.sbin/hoststated/imsg.c +++ b/usr.sbin/hoststated/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.8 2007/07/24 12:42:32 pyr Exp $ */ +/* $OpenBSD: imsg.c,v 1.9 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -16,12 +16,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/types.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/queue.h> #include <sys/uio.h> -#include <sys/param.h> + #include <net/if.h> + #include <errno.h> #include <event.h> #include <stdlib.h> diff --git a/usr.sbin/hoststated/log.c b/usr.sbin/hoststated/log.c index 2f2e37ce781..b013a1280e1 100644 --- a/usr.sbin/hoststated/log.c +++ b/usr.sbin/hoststated/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.9 2007/11/20 15:54:55 reyk Exp $ */ +/* $OpenBSD: log.c,v 1.10 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -17,16 +17,14 @@ */ #include <sys/types.h> -#include <sys/param.h> #include <sys/queue.h> #include <sys/socket.h> #include <sys/tree.h> +#include <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> -#include <net/if.h> - #include <arpa/inet.h> #include <errno.h> diff --git a/usr.sbin/hoststated/parse.y b/usr.sbin/hoststated/parse.y index 55aeef325d2..b2a9f43d31c 100644 --- a/usr.sbin/hoststated/parse.y +++ b/usr.sbin/hoststated/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.94 2007/11/23 09:39:42 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.95 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -27,8 +27,9 @@ #include <sys/socket.h> #include <sys/stat.h> #include <sys/queue.h> -#include <netinet/in.h> + #include <net/if.h> +#include <netinet/in.h> #include <arpa/inet.h> #include <arpa/nameser.h> diff --git a/usr.sbin/hoststated/pfe.c b/usr.sbin/hoststated/pfe.c index 0fabf35b329..32f8c84df18 100644 --- a/usr.sbin/hoststated/pfe.c +++ b/usr.sbin/hoststated/pfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfe.c,v 1.42 2007/11/19 15:31:36 reyk Exp $ */ +/* $OpenBSD: pfe.c,v 1.43 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -16,13 +16,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/queue.h> #include <sys/param.h> -#include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> #include <sys/un.h> + #include <net/if.h> + #include <errno.h> #include <event.h> #include <fcntl.h> diff --git a/usr.sbin/hoststated/pfe_filter.c b/usr.sbin/hoststated/pfe_filter.c index 72a91bb26a2..e8721c4b5cc 100644 --- a/usr.sbin/hoststated/pfe_filter.c +++ b/usr.sbin/hoststated/pfe_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfe_filter.c,v 1.18 2007/09/28 13:29:56 pyr Exp $ */ +/* $OpenBSD: pfe_filter.c,v 1.19 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -20,7 +20,6 @@ #include <sys/queue.h> #include <sys/socket.h> #include <sys/ioctl.h> -#include <sys/param.h> #include <net/if.h> #include <net/pfvar.h> diff --git a/usr.sbin/hoststated/relay.c b/usr.sbin/hoststated/relay.c index 9333d93deed..37e752d0930 100644 --- a/usr.sbin/hoststated/relay.c +++ b/usr.sbin/hoststated/relay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay.c,v 1.69 2007/11/24 16:13:50 reyk Exp $ */ +/* $OpenBSD: relay.c,v 1.70 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -16,10 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/queue.h> -#include <sys/param.h> #include <sys/types.h> -#include <sys/mman.h> +#include <sys/queue.h> #include <sys/time.h> #include <sys/stat.h> #include <sys/socket.h> @@ -27,11 +25,11 @@ #include <sys/tree.h> #include <sys/hash.h> +#include <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/tcp.h> -#include <net/if.h> #include <arpa/inet.h> #include <errno.h> diff --git a/usr.sbin/hoststated/relay_udp.c b/usr.sbin/hoststated/relay_udp.c index 35f389694de..fce5779c3d4 100644 --- a/usr.sbin/hoststated/relay_udp.c +++ b/usr.sbin/hoststated/relay_udp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay_udp.c,v 1.1 2007/09/10 11:59:22 reyk Exp $ */ +/* $OpenBSD: relay_udp.c,v 1.2 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org> @@ -16,9 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/queue.h> -#include <sys/param.h> #include <sys/types.h> +#include <sys/queue.h> #include <sys/time.h> #include <sys/stat.h> #include <sys/socket.h> @@ -26,11 +25,11 @@ #include <sys/tree.h> #include <sys/hash.h> +#include <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/tcp.h> -#include <net/if.h> #include <arpa/inet.h> #include <errno.h> diff --git a/usr.sbin/hoststated/ssl.c b/usr.sbin/hoststated/ssl.c index 9db92cc07d3..889857383af 100644 --- a/usr.sbin/hoststated/ssl.c +++ b/usr.sbin/hoststated/ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.c,v 1.10 2007/09/28 13:29:56 pyr Exp $ */ +/* $OpenBSD: ssl.c,v 1.11 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -16,12 +16,13 @@ * 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/socket.h> -#include <sys/param.h> -#include <netinet/in.h> + #include <net/if.h> +#include <netinet/in.h> + #include <limits.h> #include <event.h> #include <fcntl.h> diff --git a/usr.sbin/hoststated/ssl_privsep.c b/usr.sbin/hoststated/ssl_privsep.c index 2e7003a6ee0..ed01d55db5a 100644 --- a/usr.sbin/hoststated/ssl_privsep.c +++ b/usr.sbin/hoststated/ssl_privsep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_privsep.c,v 1.5 2007/11/23 09:22:40 sthen Exp $ */ +/* $OpenBSD: ssl_privsep.c,v 1.6 2007/11/24 17:07:28 reyk Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. @@ -64,6 +64,7 @@ #include <unistd.h> #include <stdio.h> + #include <openssl/err.h> #include <openssl/bio.h> #include <openssl/objects.h> diff --git a/usr.sbin/relayd/buffer.c b/usr.sbin/relayd/buffer.c index cb61f4c5271..5b3cba8e544 100644 --- a/usr.sbin/relayd/buffer.c +++ b/usr.sbin/relayd/buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer.c,v 1.7 2007/06/12 15:16:10 msf Exp $ */ +/* $OpenBSD: buffer.c,v 1.8 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -16,12 +16,13 @@ * 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/socket.h> #include <sys/uio.h> -#include <sys/param.h> + #include <net/if.h> + #include <errno.h> #include <event.h> #include <limits.h> diff --git a/usr.sbin/relayd/carp.c b/usr.sbin/relayd/carp.c index 6acdeb6efc7..4288b01b513 100644 --- a/usr.sbin/relayd/carp.c +++ b/usr.sbin/relayd/carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: carp.c,v 1.3 2007/02/26 16:10:24 reyk Exp $ */ +/* $OpenBSD: carp.c,v 1.4 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Henning Brauer <henning@openbsd.org> @@ -16,10 +16,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/types.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/ioctl.h> -#include <sys/param.h> + #include <net/if.h> #include <errno.h> diff --git a/usr.sbin/relayd/check_icmp.c b/usr.sbin/relayd/check_icmp.c index 2f54a08e0df..25dc21f2117 100644 --- a/usr.sbin/relayd/check_icmp.c +++ b/usr.sbin/relayd/check_icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_icmp.c,v 1.20 2007/10/09 05:38:58 pyr Exp $ */ +/* $OpenBSD: check_icmp.c,v 1.21 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -19,14 +19,15 @@ #include <sys/types.h> #include <sys/queue.h> #include <sys/socket.h> -#include <sys/param.h> + +#include <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> #include <netinet/icmp6.h> -#include <net/if.h> #include <arpa/inet.h> + #include <limits.h> #include <event.h> #include <errno.h> diff --git a/usr.sbin/relayd/check_script.c b/usr.sbin/relayd/check_script.c index 3d050d95058..2f09c2543a3 100644 --- a/usr.sbin/relayd/check_script.c +++ b/usr.sbin/relayd/check_script.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_script.c,v 1.3 2007/10/13 17:50:05 deraadt Exp $ */ +/* $OpenBSD: check_script.c,v 1.4 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org> @@ -16,11 +16,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/socket.h> -#include <sys/param.h> -#include <sys/types.h> #include <sys/wait.h> #include <net/if.h> diff --git a/usr.sbin/relayd/check_tcp.c b/usr.sbin/relayd/check_tcp.c index ae168bd02da..d039a1d1335 100644 --- a/usr.sbin/relayd/check_tcp.c +++ b/usr.sbin/relayd/check_tcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_tcp.c,v 1.29 2007/11/21 20:13:20 reyk Exp $ */ +/* $OpenBSD: check_tcp.c,v 1.30 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -16,13 +16,12 @@ * 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/socket.h> -#include <sys/param.h> -#include <netinet/in.h> #include <net/if.h> +#include <netinet/in.h> #include <limits.h> #include <event.h> diff --git a/usr.sbin/relayd/control.c b/usr.sbin/relayd/control.c index 22aa3384a00..97597dd8489 100644 --- a/usr.sbin/relayd/control.c +++ b/usr.sbin/relayd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.20 2007/11/19 15:31:36 reyk Exp $ */ +/* $OpenBSD: control.c,v 1.21 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -18,11 +18,12 @@ #include <sys/queue.h> #include <sys/param.h> -#include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> #include <sys/un.h> + #include <net/if.h> + #include <errno.h> #include <event.h> #include <fcntl.h> diff --git a/usr.sbin/relayd/hce.c b/usr.sbin/relayd/hce.c index c24278196c5..cb3240f52da 100644 --- a/usr.sbin/relayd/hce.c +++ b/usr.sbin/relayd/hce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hce.c,v 1.35 2007/11/21 09:54:39 pyr Exp $ */ +/* $OpenBSD: hce.c,v 1.36 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -16,17 +16,18 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/queue.h> #include <sys/param.h> -#include <sys/types.h> +#include <sys/queue.h> #include <sys/time.h> #include <sys/stat.h> #include <sys/socket.h> #include <sys/un.h> + +#include <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> -#include <net/if.h> + #include <errno.h> #include <event.h> #include <fcntl.h> diff --git a/usr.sbin/relayd/imsg.c b/usr.sbin/relayd/imsg.c index 1a58a10c1e9..bac50e2007a 100644 --- a/usr.sbin/relayd/imsg.c +++ b/usr.sbin/relayd/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.8 2007/07/24 12:42:32 pyr Exp $ */ +/* $OpenBSD: imsg.c,v 1.9 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -16,12 +16,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/types.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/queue.h> #include <sys/uio.h> -#include <sys/param.h> + #include <net/if.h> + #include <errno.h> #include <event.h> #include <stdlib.h> diff --git a/usr.sbin/relayd/log.c b/usr.sbin/relayd/log.c index 2f2e37ce781..b013a1280e1 100644 --- a/usr.sbin/relayd/log.c +++ b/usr.sbin/relayd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.9 2007/11/20 15:54:55 reyk Exp $ */ +/* $OpenBSD: log.c,v 1.10 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -17,16 +17,14 @@ */ #include <sys/types.h> -#include <sys/param.h> #include <sys/queue.h> #include <sys/socket.h> #include <sys/tree.h> +#include <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> -#include <net/if.h> - #include <arpa/inet.h> #include <errno.h> diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 55aeef325d2..b2a9f43d31c 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.94 2007/11/23 09:39:42 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.95 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -27,8 +27,9 @@ #include <sys/socket.h> #include <sys/stat.h> #include <sys/queue.h> -#include <netinet/in.h> + #include <net/if.h> +#include <netinet/in.h> #include <arpa/inet.h> #include <arpa/nameser.h> diff --git a/usr.sbin/relayd/pfe.c b/usr.sbin/relayd/pfe.c index 0fabf35b329..32f8c84df18 100644 --- a/usr.sbin/relayd/pfe.c +++ b/usr.sbin/relayd/pfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfe.c,v 1.42 2007/11/19 15:31:36 reyk Exp $ */ +/* $OpenBSD: pfe.c,v 1.43 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -16,13 +16,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/queue.h> #include <sys/param.h> -#include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> #include <sys/un.h> + #include <net/if.h> + #include <errno.h> #include <event.h> #include <fcntl.h> diff --git a/usr.sbin/relayd/pfe_filter.c b/usr.sbin/relayd/pfe_filter.c index 72a91bb26a2..e8721c4b5cc 100644 --- a/usr.sbin/relayd/pfe_filter.c +++ b/usr.sbin/relayd/pfe_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfe_filter.c,v 1.18 2007/09/28 13:29:56 pyr Exp $ */ +/* $OpenBSD: pfe_filter.c,v 1.19 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -20,7 +20,6 @@ #include <sys/queue.h> #include <sys/socket.h> #include <sys/ioctl.h> -#include <sys/param.h> #include <net/if.h> #include <net/pfvar.h> diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c index 9333d93deed..37e752d0930 100644 --- a/usr.sbin/relayd/relay.c +++ b/usr.sbin/relayd/relay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay.c,v 1.69 2007/11/24 16:13:50 reyk Exp $ */ +/* $OpenBSD: relay.c,v 1.70 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -16,10 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/queue.h> -#include <sys/param.h> #include <sys/types.h> -#include <sys/mman.h> +#include <sys/queue.h> #include <sys/time.h> #include <sys/stat.h> #include <sys/socket.h> @@ -27,11 +25,11 @@ #include <sys/tree.h> #include <sys/hash.h> +#include <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/tcp.h> -#include <net/if.h> #include <arpa/inet.h> #include <errno.h> diff --git a/usr.sbin/relayd/relay_udp.c b/usr.sbin/relayd/relay_udp.c index 35f389694de..fce5779c3d4 100644 --- a/usr.sbin/relayd/relay_udp.c +++ b/usr.sbin/relayd/relay_udp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay_udp.c,v 1.1 2007/09/10 11:59:22 reyk Exp $ */ +/* $OpenBSD: relay_udp.c,v 1.2 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org> @@ -16,9 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/queue.h> -#include <sys/param.h> #include <sys/types.h> +#include <sys/queue.h> #include <sys/time.h> #include <sys/stat.h> #include <sys/socket.h> @@ -26,11 +25,11 @@ #include <sys/tree.h> #include <sys/hash.h> +#include <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/tcp.h> -#include <net/if.h> #include <arpa/inet.h> #include <errno.h> diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c index 9e05a2d44cb..1bbc75a7019 100644 --- a/usr.sbin/relayd/relayd.c +++ b/usr.sbin/relayd/relayd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relayd.c,v 1.58 2007/11/24 16:13:50 reyk Exp $ */ +/* $OpenBSD: relayd.c,v 1.59 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -19,11 +19,12 @@ #include <sys/types.h> #include <sys/queue.h> #include <sys/socket.h> -#include <sys/param.h> #include <sys/wait.h> + #include <net/if.h> #include <netinet/in.h> #include <arpa/inet.h> + #include <string.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr.sbin/relayd/ssl.c b/usr.sbin/relayd/ssl.c index 9db92cc07d3..889857383af 100644 --- a/usr.sbin/relayd/ssl.c +++ b/usr.sbin/relayd/ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.c,v 1.10 2007/09/28 13:29:56 pyr Exp $ */ +/* $OpenBSD: ssl.c,v 1.11 2007/11/24 17:07:28 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -16,12 +16,13 @@ * 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/socket.h> -#include <sys/param.h> -#include <netinet/in.h> + #include <net/if.h> +#include <netinet/in.h> + #include <limits.h> #include <event.h> #include <fcntl.h> diff --git a/usr.sbin/relayd/ssl_privsep.c b/usr.sbin/relayd/ssl_privsep.c index 2e7003a6ee0..ed01d55db5a 100644 --- a/usr.sbin/relayd/ssl_privsep.c +++ b/usr.sbin/relayd/ssl_privsep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_privsep.c,v 1.5 2007/11/23 09:22:40 sthen Exp $ */ +/* $OpenBSD: ssl_privsep.c,v 1.6 2007/11/24 17:07:28 reyk Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. @@ -64,6 +64,7 @@ #include <unistd.h> #include <stdio.h> + #include <openssl/err.h> #include <openssl/bio.h> #include <openssl/objects.h> |