From owner-p4-projects@FreeBSD.ORG Fri Dec 1 13:00:02 2006 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 0DB1216A4A7; Fri, 1 Dec 2006 13:00:02 +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 DC07F16A49E for ; Fri, 1 Dec 2006 13:00:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8029943CA3 for ; Fri, 1 Dec 2006 12:59:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB1D01hR076865 for ; Fri, 1 Dec 2006 13:00:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB1D00LG076862 for perforce@freebsd.org; Fri, 1 Dec 2006 13:00:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 1 Dec 2006 13:00:00 GMT Message-Id: <200612011300.kB1D00LG076862@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 110796 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: Fri, 01 Dec 2006 13:00:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=110796 Change 110796 by rwatson@rwatson_zoo on 2006/12/01 12:59:05 Revert branch-local changes in priv.h. Affected files ... .. //depot/projects/trustedbsd/priv/sys/sys/priv.h#10 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/sys/priv.h#10 (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/sys/priv.h,v 1.1 2006/11/06 13:37:18 rwatson Exp $ */ /* @@ -48,7 +48,10 @@ * When adding a new privilege, remember to determine if it's appropriate for * use in jail, and update the privilege switch in kern_jail.c as necessary. */ -/* Track beginning of privilege list. */ + +/* + * Track beginning of privilege list. + */ #define _PRIV_LOWEST 0 /* @@ -380,9 +383,8 @@ #define PRIV_VM86_INTCALL 650/* Allow invoking vm86 int handlers. */ /* - * Set of reserved privilege values, which will be allocated to code - * as needed, in order to avoid renumbering later privileges due to - * insertion. + * Set of reserved privilege values, which will be allocated to code as + * needed, in order to avoid renumbering later privileges due to insertion. */ #define _PRIV_RESERVED0 660 #define _PRIV_RESERVED1 661 @@ -402,11 +404,11 @@ #define _PRIV_RESERVED15 675 /* - * Define a set of valid privilege numbers that can be used by - * loadable modules that don't yet have privilege reservations. - * Ideally, these should not be used, since their meaning is opaque - * to any policies that are aware of specific privileges, such as - * jail, and as such may be arbitrarily denied. + * Define a set of valid privilege numbers that can be used by loadable + * modules that don't yet have privilege reservations. Ideally, these should + * not be used, since their meaning is opaque to any policies that are aware + * of specific privileges, such as jail, and as such may be arbitrarily + * denied. */ #define PRIV_MODULE0 700 #define PRIV_MODULE1 701 @@ -433,7 +435,8 @@ /* * Validate that a named privilege is known by the privilege system. Invalid * privileges presented to the privilege system by a priv_check interface - * will result in a panic. + * will result in a panic. This is only approximate due to sparse allocation + * of the privilege space. */ #define PRIV_VALID(x) ((x) > _PRIV_LOWEST && (x) < _PRIV_HIGHEST)