Date: Fri, 1 Dec 2006 13:01:03 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 110797 for review Message-ID: <200612011301.kB1D13Ya076986@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=110797 Change 110797 by rwatson@rwatson_zoo on 2006/12/01 13:00:46 Revert additional branch-local changes in priv branch. Affected files ... .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_priv.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/jail.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mac.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mac_policy.h#8 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/security/mac/mac_priv.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/security/mac/mac_priv.c,v 1.1 2006/11/06 13:37:18 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/priv/sys/sys/jail.h#5 (text+ko) ==== @@ -40,7 +40,6 @@ #include <sys/_lock.h> #include <sys/_mutex.h> #include <sys/_task.h> -#include <sys/priv.h> #define JAIL_MAX 999999 ==== //depot/projects/trustedbsd/priv/sys/sys/mac.h#5 (text+ko) ==== @@ -47,6 +47,8 @@ #ifndef _SYS_MAC_H_ #define _SYS_MAC_H_ +#include <sys/_label.h> + #ifndef _POSIX_MAC #define _POSIX_MAC #endif ==== //depot/projects/trustedbsd/priv/sys/sys/mac_policy.h#8 (text+ko) ==== @@ -55,7 +55,6 @@ * Operations are sorted first by general class of operation, then * alphabetically. */ -#include <sys/_label.h> #include <sys/acl.h> /* XXX acl_type_t */ struct acl;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612011301.kB1D13Ya076986>