PERFORCE change 113359 for review

[Todd Miller]

http://perforce.freebsd.org/chv.cgi?CH=113359

Change 113359 by millert at millert_macbook on 2007/01/22 16:20:08

	Add some more missing modification notices and mac_framework.h
	includes.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bpf.h#4 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/ether_inet_pr_module.c#5 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if.c#4 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_faith.c#4 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_gif.c#4 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_loop.c#4 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_stf.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bpf.h#4 (text+ko) ====

@@ -69,6 +69,12 @@
  *
  * $FreeBSD: src/sys/net/bpf.h,v 1.21.2.3 2001/08/01 00:23:13 fenner Exp $
  */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
 
 #ifndef _NET_BPF_H_
 #define _NET_BPF_H_

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/ether_inet_pr_module.c#5 (text+ko) ====

@@ -60,9 +60,14 @@
  * SUCH DAMAGE.
  *
  */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
 
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -104,6 +109,10 @@
 #include <net/if_vlan_var.h>
 #endif /* NVLAN > 0 */
 
+#ifdef MAC
+#include <security/mac_framework.h>
+#endif
+
 /* Local function declerations */
 int ether_attach_inet(struct ifnet *ifp, u_long proto_family);
 int ether_detach_inet(struct ifnet *ifp, u_long proto_family);

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if.c#4 (text+ko) ====

@@ -62,6 +62,12 @@
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/net/if.c,v 1.85.2.9 2001/07/24 19:10:17 brooks Exp $
  */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
 
 #include <kern/locks.h>
 

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_faith.c#4 (text+ko) ====

@@ -68,6 +68,12 @@
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
  * Id: if_loop.c,v 1.22 1996/06/19 16:24:10 wollman Exp
  */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
 
 /*
  * Loopback interface driver for protocol testing and timing.
@@ -113,6 +119,10 @@
 
 #include <net/net_osdep.h>
 
+#ifdef MAC
+#include <security/mac_framework.h>
+#endif
+
 static int faithioctl(struct ifnet *, u_long, void*);
 int faith_pre_output(struct ifnet *, register struct mbuf **,
 	const struct sockaddr *, caddr_t, char *, char *, u_long);

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_gif.c#4 (text+ko) ====

@@ -58,6 +58,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -100,6 +106,10 @@
 
 #include <net/net_osdep.h>
 
+#ifdef MAC
+#include <security/mac_framework.h>
+#endif
+
 #define GIFNAME		"gif"
 #define GIFDEV		"if_gif"
 #define GIF_MAXUNIT	0x7fff	/* ifp->if_unit is only 15 bits */

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_loop.c#4 (text+ko) ====

@@ -62,6 +62,12 @@
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/if_loop.c,v 1.47.2.5 2001/07/03 11:01:41 ume Exp $
  */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
 
 /*
  * Loopback interface driver for protocol testing and timing.
@@ -112,6 +118,10 @@
 #include <net/bpfdesc.h>
 #endif
 
+#ifdef MAC
+#include <security/mac_framework.h>
+#endif
+
 #define NLOOP_ATTACHMENTS (NLOOP * 12)
 
 struct lo_statics_str {

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_stf.c#3 (text+ko) ====

@@ -29,6 +29,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
 
 /*
  * 6to4 interface, based on RFC3056.
@@ -109,6 +115,10 @@
 
 #include <net/bpf.h>
 
+#ifdef MAC
+#include <security/mac_framework.h>
+#endif
+
 #define IN6_IS_ADDR_6TO4(x)	(ntohs((x)->s6_addr16[0]) == 0x2002)
 #define GET_V4(x)	((struct in_addr *)(&(x)->s6_addr16[1]))