From owner-p4-projects@FreeBSD.ORG  Mon Jul  4 11:07:41 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 59F8316A420; Mon,  4 Jul 2005 11:07:41 +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 34BF016A41C
	for <perforce@freebsd.org>; Mon,  4 Jul 2005 11:07:41 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 20FCE43D48
	for <perforce@freebsd.org>; Mon,  4 Jul 2005 11:07:41 +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.1/8.13.1) with ESMTP id j64B7fA1097003
	for <perforce@freebsd.org>; Mon, 4 Jul 2005 11:07:41 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j64B7edd096997
	for perforce@freebsd.org; Mon, 4 Jul 2005 11:07:40 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 4 Jul 2005 11:07:40 GMT
Message-Id: <200507041107.j64B7edd096997@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 79534 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: Mon, 04 Jul 2005 11:07:42 -0000

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

Change 79534 by rwatson@rwatson_paprika on 2005/07/04 11:07:18

	Convert suser() checks associated with retrieving file system id/
	handle data to CAP_SYS_ADMIN.  This may be the closest match --
	another alternative might be CAP_SYS_RAWIO.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_syscalls.c#16 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_syscalls.c#16 (text+ko) ====

@@ -568,7 +568,7 @@
 				continue;
 			}
 			sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
-			if (suser(td)) {
+			if (cap_check(td, CAP_SYS_ADMIN)) {
 				bcopy(sp, &sb, sizeof(sb));
 				sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0;
 				sp = &sb;
@@ -3927,7 +3927,7 @@
 	int vfslocked;
 	int error;
 
-	error = suser(td);
+	error = cap_check(td, CAP_SYS_ADMIN);
 	if (error)
 		return (error);
 	NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | MPSAFE,