From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jan 22 16:12:20 2007 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A4FA616A40B for ; Mon, 22 Jan 2007 16:12:20 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.freebsd.org (Postfix) with ESMTP id 2B0C513C461 for ; Mon, 22 Jan 2007 16:12:18 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id 2374C4901E for ; Mon, 22 Jan 2007 11:12:10 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id B772A581AD; Mon, 22 Jan 2007 16:12:08 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 95F7116A4F8; Mon, 22 Jan 2007 16:12:00 +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 73FA116A401 for ; Mon, 22 Jan 2007 16:11:59 +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 4AFB113C45B for ; Mon, 22 Jan 2007 16:11:59 +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 l0MGBxlx028807 for ; Mon, 22 Jan 2007 16:11:59 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGBwun028801 for perforce@freebsd.org; Mon, 22 Jan 2007 16:11:58 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:11:58 GMT Message-Id: <200701221611.l0MGBwun028801@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 113354 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2007 16:12:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=113354 Change 113354 by millert@millert_macbook on 2007/01/22 16:11:40 Move ipq_label to be before the IPDIVERT elements since IPDIVERT is not always defined which had the effect of writing the label pointer over the IPDIVERT elements in mac_inet.c. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_var.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_var.h#4 (text+ko) ==== @@ -61,6 +61,12 @@ * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2007 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 _NETINET_IP_VAR_H_ #define _NETINET_IP_VAR_H_ @@ -94,6 +100,9 @@ u_long ipq_nfrags; TAILQ_ENTRY(ipq) ipq_list; u_long reserved[1]; /* for future use */ +#ifdef MAC + struct label *ipq_label; /* MAC label */ +#endif #if IPDIVERT #ifdef IPDIVERT_44 u_int32_t ipq_div_info; /* ipfw divert port & flags */ @@ -102,9 +111,6 @@ #endif u_int16_t ipq_div_cookie; /* ipfw divert cookie */ #endif -#ifdef MAC - struct label *ipq_label; /* MAC label */ -#endif }; /*