From owner-p4-projects Sat Jul 27 13: 2:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BD1537B405; Sat, 27 Jul 2002 13:02:21 -0700 (PDT) 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 E16BA37B401 for ; Sat, 27 Jul 2002 13:02:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9648943E6A for ; Sat, 27 Jul 2002 13:02:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6RK1sJU022883 for ; Sat, 27 Jul 2002 13:01:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6RK1sAI022880 for perforce@freebsd.org; Sat, 27 Jul 2002 13:01:54 -0700 (PDT) Date: Sat, 27 Jul 2002 13:01:54 -0700 (PDT) Message-Id: <200207272001.g6RK1sAI022880@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15002 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15002 Change 15002 by rwatson@rwatson_paprika on 2002/07/27 12:59:51 Rename VALL to VALLPERM to match the central source tree version. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#3 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#11 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#44 edit .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#30 edit .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#3 (text+ko) ==== @@ -181,8 +181,8 @@ left -= len; cur += len; - anymode = (rule->mbr_mode & VALL); - unknownmode = (rule->mbr_mode & ~VALL); + anymode = (rule->mbr_mode & VALLPERM); + unknownmode = (rule->mbr_mode & ~VALLPERM); if (rule->mbr_mode & VADMIN) { len = snprintf(cur, left, "a"); ==== //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#11 (text+ko) ==== @@ -90,7 +90,7 @@ */ #ifndef CAPABILITIES if (suser_cred(cred, PRISON_ROOT) == 0) - cap_granted = (VEXEC | VREAD | VWRITE | VADMIN | VAPPEND); + cap_granted = VALLPERM; else cap_granted = 0; #else ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#44 (text+ko) ==== @@ -109,7 +109,7 @@ if ((rule->mbr_object.mbi_flags | MBI_BITS) != MBI_BITS) return (EINVAL); - if ((rule->mbr_mode | VALL) != VALL) + if ((rule->mbr_mode | VALLPERM) != VALLPERM) return (EINVAL); return (0); ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#30 (text+ko) ==== @@ -248,7 +248,7 @@ #define VAPPEND 040000 /* permission to write/append */ #define VADMIN 010000 /* permission to administer vnode */ #define VSTAT 020000 /* permission to retrieve vnode attrs */ -#define VALL (VREAD | VWRITE | VEXEC | VAPPEND | VSTAT | VADMIN) +#define VALLPERM (VREAD | VWRITE | VEXEC | VAPPEND | VSTAT | VADMIN) /* * Token indicating no attribute value yet assigned. ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#6 (text+ko) ==== @@ -118,8 +118,8 @@ } printf("mode "); - anymode = (rule->mbr_mode & VALL); - unknownmode = (rule->mbr_mode & ~VALL); + anymode = (rule->mbr_mode & VALLPERM); + unknownmode = (rule->mbr_mode & ~VALLPERM); if (rule->mbr_mode & VADMIN) printf("a"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message