From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:20:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ADED16A402; Mon, 22 Jan 2007 16:20:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F336216A400 for ; Mon, 22 Jan 2007 16:20:12 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C0EEE13C448 for ; Mon, 22 Jan 2007 16:20:12 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MGKCX8030018 for ; Mon, 22 Jan 2007 16:20:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGKCTG030015 for perforce@freebsd.org; Mon, 22 Jan 2007 16:20:12 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:20:12 GMT Message-Id: <200701221620.l0MGKCTG030015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 113359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2007 16:20:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=113359 Change 113359 by millert@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 #include #include @@ -104,6 +109,10 @@ #include #endif /* NVLAN > 0 */ +#ifdef MAC +#include +#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 ==== //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 +#ifdef MAC +#include +#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 #include @@ -100,6 +106,10 @@ #include +#ifdef MAC +#include +#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 #endif +#ifdef MAC +#include +#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 +#ifdef MAC +#include +#endif + #define IN6_IS_ADDR_6TO4(x) (ntohs((x)->s6_addr16[0]) == 0x2002) #define GET_V4(x) ((struct in_addr *)(&(x)->s6_addr16[1]))