From aed557087269cd052aa76cc15af4a1fd70cbbf24 Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 22 Oct 2006 11:52:19 +0000
Subject: Complete break-out of sys/sys/mac.h into
 sys/security/mac/mac_framework.h begun with a repo-copy of mac.h to
 mac_framework.h.  sys/mac.h now contains the userspace and user<->kernel API
 and definitions, with all in-kernel interfaces moved to mac_framework.h,
 which is now included across most of the kernel instead.

This change is the first step in a larger cleanup and sweep of MAC
Framework interfaces in the kernel, and will not be MFC'd.

Obtained from:	TrustedBSD Project
Sponsored by:	SPARTA
---
 sys/netinet/if_ether.c     | 3 ++-
 sys/netinet/igmp.c         | 3 ++-
 sys/netinet/in_pcb.c       | 3 ++-
 sys/netinet/ip_divert.c    | 3 ++-
 sys/netinet/ip_fw2.c       | 3 ++-
 sys/netinet/ip_icmp.c      | 3 ++-
 sys/netinet/ip_input.c     | 3 ++-
 sys/netinet/ip_mroute.c    | 3 ++-
 sys/netinet/ip_options.c   | 3 ++-
 sys/netinet/ip_output.c    | 3 ++-
 sys/netinet/raw_ip.c       | 3 ++-
 sys/netinet/tcp_input.c    | 3 ++-
 sys/netinet/tcp_output.c   | 3 ++-
 sys/netinet/tcp_reass.c    | 3 ++-
 sys/netinet/tcp_subr.c     | 3 ++-
 sys/netinet/tcp_syncache.c | 3 ++-
 sys/netinet/tcp_timewait.c | 3 ++-
 sys/netinet/udp_usrreq.c   | 3 ++-
 18 files changed, 36 insertions(+), 18 deletions(-)

(limited to 'sys/netinet')

diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index ff2f701c154f..61265d41ad70 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -45,7 +45,6 @@
 #include <sys/queue.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
@@ -70,6 +69,8 @@
 #include <netinet/ip_carp.h>
 #endif
 
+#include <security/mac/mac_framework.h>
+
 #define SIN(s) ((struct sockaddr_in *)s)
 #define SDL(s) ((struct sockaddr_dl *)s)
 
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index d82727d8287c..ad63218f1e55 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -49,7 +49,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
@@ -71,6 +70,8 @@
 
 #include <machine/in_cksum.h>
 
+#include <security/mac/mac_framework.h>
+
 static MALLOC_DEFINE(M_IGMP, "igmp", "igmp state");
 
 static struct router_info	*find_rti(struct ifnet *ifp);
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index b117b1328fdc..60e7bf09191f 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -36,7 +36,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
@@ -80,6 +79,8 @@
 #include <netipsec/key.h>
 #endif /* FAST_IPSEC */
 
+#include <security/mac/mac_framework.h>
+
 /*
  * These configure the range of local port addresses assigned to
  * "unspecified" outgoing connections/packets/whatever.
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index c620e7390d29..d416b0e821c9 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -45,7 +45,6 @@
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/kernel.h>
@@ -72,6 +71,8 @@
 #include <netinet/ip_var.h>
 #include <netinet/ip_fw.h>
 
+#include <security/mac/mac_framework.h>
+
 /*
  * Divert sockets
  */
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index 2c6b46116d4e..9fa652e3e68f 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ip_fw2.c
@@ -52,7 +52,6 @@
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/jail.h>
-#include <sys/mac.h>
 #include <sys/module.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
@@ -101,6 +100,8 @@
 
 #include <machine/in_cksum.h>	/* XXX for in_cksum */
 
+#include <security/mac/mac_framework.h>
+
 /*
  * set_disable contains one bit per set value (0..31).
  * If the bit is set, all rules with the corresponding set
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index b3539a91948e..3385143d3e52 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -35,7 +35,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
@@ -73,6 +72,8 @@
 
 #include <machine/in_cksum.h>
 
+#include <security/mac/mac_framework.h>
+
 /*
  * ICMP routines: error generation, receive packet processing, and
  * routines to turnaround packets back to the originator, and
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 84768a7f2d58..5e682b6ed969 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -40,7 +40,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/domain.h>
@@ -81,6 +80,8 @@
 #include <netinet/ip_fw.h>
 #include <netinet/ip_dummynet.h>
 
+#include <security/mac/mac_framework.h>
+
 int rsvp_on = 0;
 
 int	ipforwarding = 0;
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 125a486e9809..a248b72bb830 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -65,7 +65,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
@@ -98,6 +97,8 @@
 #include <netinet/udp.h>
 #include <machine/in_cksum.h>
 
+#include <security/mac/mac_framework.h>
+
 /*
  * Control debugging code for rsvp and multicast routing code.
  * Can only set them with the debugger.
diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c
index 39126c892ce6..8986275bf336 100644
--- a/sys/netinet/ip_options.c
+++ b/sys/netinet/ip_options.c
@@ -36,7 +36,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 /* #include <sys/malloc.h> */
 #include <sys/domain.h>
@@ -66,6 +65,8 @@
 
 #include <sys/socketvar.h>
 
+#include <security/mac/mac_framework.h>
+
 static int	ip_dosourceroute = 0;
 SYSCTL_INT(_net_inet_ip, IPCTL_SOURCEROUTE, sourceroute, CTLFLAG_RW,
     &ip_dosourceroute, 0, "Enable forwarding source routed IP packets");
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index f9c78fd8c26d..6e3833e9e9da 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -38,7 +38,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
@@ -71,6 +70,8 @@
 
 #include <machine/in_cksum.h>
 
+#include <security/mac/mac_framework.h>
+
 static MALLOC_DEFINE(M_IPMOPTS, "ip_moptions", "internet multicast options");
 
 #define print_ip(x, a, y)	 printf("%s %d.%d.%d.%d%s",\
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 070d32e14077..837933b1f632 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -38,7 +38,6 @@
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
@@ -74,6 +73,8 @@
 #include <netinet6/ipsec.h>
 #endif /*IPSEC*/
 
+#include <security/mac/mac_framework.h>
+
 struct	inpcbhead ripcb;
 struct	inpcbinfo ripcbinfo;
 
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 9508abc35388..9aef64b54410 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -41,7 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>		/* for proc0 declaration */
@@ -98,6 +97,8 @@
 
 #include <machine/in_cksum.h>
 
+#include <security/mac/mac_framework.h>
+
 static const int tcprexmtthresh = 3;
 
 struct	tcpstat tcpstat;
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 6833e7e867d1..25402cd7ce74 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -42,7 +42,6 @@
 #include <sys/domain.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/protosw.h>
@@ -85,6 +84,8 @@
 
 #include <machine/in_cksum.h>
 
+#include <security/mac/mac_framework.h>
+
 #ifdef notyet
 extern struct mbuf *m_copypack();
 #endif
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 9508abc35388..9aef64b54410 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -41,7 +41,6 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>		/* for proc0 declaration */
@@ -98,6 +97,8 @@
 
 #include <machine/in_cksum.h>
 
+#include <security/mac/mac_framework.h>
+
 static const int tcprexmtthresh = 3;
 
 struct	tcpstat tcpstat;
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index af9931311282..2b4f9bc78d7b 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -43,7 +43,6 @@
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #ifdef INET6
@@ -113,6 +112,8 @@
 #include <machine/in_cksum.h>
 #include <sys/md5.h>
 
+#include <security/mac/mac_framework.h>
+
 int	tcp_mssdflt = TCP_MSS;
 SYSCTL_INT(_net_inet_tcp, TCPCTL_MSSDFLT, mssdflt, CTLFLAG_RW,
     &tcp_mssdflt , 0, "Default TCP Maximum Segment Size");
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 06859d492d84..e8ca230932cb 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -44,7 +44,6 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/malloc.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/md5.h>
 #include <sys/proc.h>		/* for proc0 declaration */
@@ -97,6 +96,8 @@
 
 #include <machine/in_cksum.h>
 
+#include <security/mac/mac_framework.h>
+
 static int tcp_syncookies = 1;
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, syncookies, CTLFLAG_RW,
     &tcp_syncookies, 0,
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index af9931311282..2b4f9bc78d7b 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -43,7 +43,6 @@
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #ifdef INET6
@@ -113,6 +112,8 @@
 #include <machine/in_cksum.h>
 #include <sys/md5.h>
 
+#include <security/mac/mac_framework.h>
+
 int	tcp_mssdflt = TCP_MSS;
 SYSCTL_INT(_net_inet_tcp, TCPCTL_MSSDFLT, mssdflt, CTLFLAG_RW,
     &tcp_mssdflt , 0, "Default TCP Maximum Segment Size");
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index b1911b582815..28245875afcc 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -42,7 +42,6 @@
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
@@ -87,6 +86,8 @@
 
 #include <machine/in_cksum.h>
 
+#include <security/mac/mac_framework.h>
+
 /*
  * UDP protocol implementation.
  * Per RFC 768, August, 1980.
-- 
cgit v1.2.3