From d6c8b32347fc87a189709a2a67f355a7a7107605 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Tue, 20 Jan 2015 18:26:59 +0000
Subject: Adjust <sys/param.h> comments regarding use of use of MSIZE, or
 delete <sys/param.h> if now possible ok guenther

---
 usr.sbin/tcpdump/pf_print_state.c | 3 ++-
 usr.sbin/tcpdump/pfctl_osfp.c     | 7 ++++---
 usr.sbin/tcpdump/print-enc.c      | 4 ++--
 usr.sbin/tcpdump/print-pflog.c    | 9 ++++-----
 usr.sbin/tcpdump/privsep.c        | 8 ++++----
 5 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'usr.sbin/tcpdump')

diff --git a/usr.sbin/tcpdump/pf_print_state.c b/usr.sbin/tcpdump/pf_print_state.c
index c6971fcdba5..fb1e97873c4 100644
--- a/usr.sbin/tcpdump/pf_print_state.c
+++ b/usr.sbin/tcpdump/pf_print_state.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_print_state.c,v 1.11 2012/07/08 17:48:37 lteo Exp $	*/
+/*	$OpenBSD: pf_print_state.c,v 1.12 2015/01/20 18:26:58 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -34,6 +34,7 @@
 #include <sys/socket.h>
 #include <net/if.h>
 #define TCPSTATES
+#include <netinet/in.h>
 #include <netinet/tcp_fsm.h>
 #include <net/pfvar.h>
 #include <arpa/inet.h>
diff --git a/usr.sbin/tcpdump/pfctl_osfp.c b/usr.sbin/tcpdump/pfctl_osfp.c
index ccc7dfb3deb..95a4d9f5bd8 100644
--- a/usr.sbin/tcpdump/pfctl_osfp.c
+++ b/usr.sbin/tcpdump/pfctl_osfp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_osfp.c,v 1.9 2014/08/14 12:44:44 mpi Exp $ */
+/*	$OpenBSD: pfctl_osfp.c,v 1.10 2015/01/20 18:26:58 deraadt Exp $ */
 
 /*
  * Copyright (c) 2003 Mike Frantzen <frantzen@openbsd.org>
@@ -20,6 +20,9 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip6.h>
 #include <net/if.h>
 #include <net/pfvar.h>
 
@@ -30,8 +33,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
 
 #include "privsep.h"
 #include "pfctl_parser.h"
diff --git a/usr.sbin/tcpdump/print-enc.c b/usr.sbin/tcpdump/print-enc.c
index d2b64e26fe5..a7039125864 100644
--- a/usr.sbin/tcpdump/print-enc.c
+++ b/usr.sbin/tcpdump/print-enc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-enc.c,v 1.13 2015/01/16 06:40:21 deraadt Exp $	*/
+/*	$OpenBSD: print-enc.c,v 1.14 2015/01/20 18:26:58 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996
@@ -21,7 +21,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <sys/param.h>	/* MSIZE */
+#include <sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/file.h>
diff --git a/usr.sbin/tcpdump/print-pflog.c b/usr.sbin/tcpdump/print-pflog.c
index df7c3d2dc7e..3b29501841e 100644
--- a/usr.sbin/tcpdump/print-pflog.c
+++ b/usr.sbin/tcpdump/print-pflog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-pflog.c,v 1.26 2015/01/16 06:40:21 deraadt Exp $	*/
+/*	$OpenBSD: print-pflog.c,v 1.27 2015/01/20 18:26:58 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996
@@ -21,7 +21,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <sys/param.h>	/* MSIZE MAXCOMLEN */
+#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/file.h>
@@ -34,13 +34,12 @@
 #endif
 
 struct rtentry;
-#include <net/if.h>
-#include <net/if_pflog.h>
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
-
+#include <net/if.h>
 #include <net/pfvar.h>
+#include <net/if_pflog.h>
 
 #include <arpa/inet.h>
 
diff --git a/usr.sbin/tcpdump/privsep.c b/usr.sbin/tcpdump/privsep.c
index 237af086a13..da9dfd58867 100644
--- a/usr.sbin/tcpdump/privsep.c
+++ b/usr.sbin/tcpdump/privsep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: privsep.c,v 1.31 2015/01/16 06:40:22 deraadt Exp $	*/
+/*	$OpenBSD: privsep.c,v 1.32 2015/01/20 18:26:58 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003 Can Erkin Acar
@@ -21,11 +21,11 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/pfvar.h>
 #include <netinet/in.h>
+#include <net/if.h>
 #include <netinet/if_ether.h>
+#include <net/bpf.h>
+#include <net/pfvar.h>
 
 #include <rpc/rpc.h>
 
-- 
cgit v1.2.3