Date: Mon, 22 Jan 2007 16:11:58 GMT From: Todd Miller <millert@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 113354 for review Message-ID: <200701221611.l0MGBwun028801@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 }; /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701221611.l0MGBwun028801>