From owner-p4-projects@FreeBSD.ORG  Tue Nov  8 20:37:58 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DC74616A423; Tue,  8 Nov 2005 20:37:57 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 93F7D16A420
	for <perforce@freebsd.org>; Tue,  8 Nov 2005 20:37:57 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 60B0A43D46
	for <perforce@freebsd.org>; Tue,  8 Nov 2005 20:37:57 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jA8KbvVB026879
	for <perforce@freebsd.org>; Tue, 8 Nov 2005 20:37:57 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA8Kbvsq026876
	for perforce@freebsd.org; Tue, 8 Nov 2005 20:37:57 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 8 Nov 2005 20:37:57 GMT
Message-Id: <200511082037.jA8Kbvsq026876@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 86485 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Nov 2005 20:37:59 -0000

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

Change 86485 by millert@millert_ibook on 2005/11/08 20:37:41

	Revert to stock 10.3.8 ipc_entry.h.  The IE_BITS_TYPE_MASK change
	was only needed for the 10.3.3 label handle implementation.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_entry.h#3 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_entry.h#3 (text+ko) ====

@@ -48,14 +48,8 @@
  * the rights to redistribute these changes.
  */
 /*
- * NOTICE: This file was modified by McAfee Research in 2004 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.
  */
 /*
- */
-/*
  *	File:	ipc/ipc_entry.h
  *	Author:	Rich Draves
  *	Date:	1989
@@ -120,7 +114,7 @@
 #define	IE_BITS_UREFS_MASK	0x0000ffff	/* 16 bits of user-reference */
 #define	IE_BITS_UREFS(bits)	((bits) & IE_BITS_UREFS_MASK)
 
-#define	IE_BITS_TYPE_MASK	0x003f0000	/* 6 bits of capability type */
+#define	IE_BITS_TYPE_MASK	0x001f0000	/* 5 bits of capability type */
 #define	IE_BITS_TYPE(bits)	((bits) & IE_BITS_TYPE_MASK)
 
 #define	IE_BITS_COLLISION	0x00800000	/* 1 bit for collisions */