From owner-p4-projects@FreeBSD.ORG  Tue Jun  5 16:52:10 2007
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 996E816A469; Tue,  5 Jun 2007 16:52:10 +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 555C716A421
	for <perforce@freebsd.org>; Tue,  5 Jun 2007 16:52:10 +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 414E613C455
	for <perforce@freebsd.org>; Tue,  5 Jun 2007 16:52:10 +0000 (UTC)
	(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.8/8.13.8) with ESMTP id l55GqALk076468
	for <perforce@freebsd.org>; Tue, 5 Jun 2007 16:52:10 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l55Gq9Ea076462
	for perforce@freebsd.org; Tue, 5 Jun 2007 16:52:09 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 5 Jun 2007 16:52:09 GMT
Message-Id: <200706051652.l55Gq9Ea076462@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 <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 121003 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, 05 Jun 2007 16:52:10 -0000

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

Change 121003 by rwatson@rwatson_zoo on 2007/06/05 16:51:57

	Convert a few more priv_check_cred() calls to priv_check() now that
	life is simpler.

Affected files ...

.. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#11 edit
.. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#12 edit

Differences ...

==== //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#11 (text+ko) ====

@@ -1160,8 +1160,7 @@
 	if (uid != de->de_uid || gid != de->de_gid) {
 		if ((ap->a_cred->cr_uid != de->de_uid) || uid != de->de_uid ||
 		    (gid != de->de_gid && !groupmember(gid, ap->a_cred))) {
-			error = priv_check_cred(ap->a_td->td_ucred,
-			    PRIV_VFS_CHOWN, 0);
+			error = priv_check(ap->a_td, PRIV_VFS_CHOWN);
 			if (error)
 				return (error);
 		}
@@ -1172,8 +1171,7 @@
 
 	if (vap->va_mode != (mode_t)VNOVAL) {
 		if (ap->a_cred->cr_uid != de->de_uid) {
-			error = priv_check_cred(ap->a_td->td_ucred,
-			    PRIV_VFS_ADMIN, 0);
+			error = priv_check(ap->a_td, PRIV_VFS_ADMIN);
 			if (error)
 				return (error);
 		}

==== //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#12 (text+ko) ====

@@ -114,8 +114,7 @@
 			 * p_candebug() should implement it, or other checks
 			 * are missing.
 			 */
-			error = priv_check_cred(td->td_ucred,
-			    PRIV_DEBUG_SUGID, 0);
+			error = priv_check(td, PRIV_DEBUG_SUGID);
 			if (error)
 				break;
 		}