From owner-p4-projects  Sun Jul 21 13:33:13 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 401BE37B401; Sun, 21 Jul 2002 13:33:09 -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 C23C937B400
	for <perforce@freebsd.org>; Sun, 21 Jul 2002 13:33:08 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7F03F43E3B
	for <perforce@freebsd.org>; Sun, 21 Jul 2002 13:33:08 -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 g6LKX8JU004803
	for <perforce@freebsd.org>; Sun, 21 Jul 2002 13:33:08 -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 g6LKX8tr004797
	for perforce@freebsd.org; Sun, 21 Jul 2002 13:33:08 -0700 (PDT)
Date: Sun, 21 Jul 2002 13:33:08 -0700 (PDT)
Message-Id: <200207212033.g6LKX8tr004797@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 <rwatson@FreeBSD.org>
Subject: PERFORCE change 14631 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14631

Change 14631 by rwatson@rwatson_curry on 2002/07/21 13:32:28

	Further diff reduction and simplification against -CURRENT.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#18 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#18 (text+ko) ====

@@ -181,8 +181,7 @@
 		/*
 		 * Check for symbolic link
 		 */
-		if (cnp->cn_flags & ISSYMLINK) {
-		} else {
+		if ((cnp->cn_flags & ISSYMLINK) == 0) {
 			if ((cnp->cn_flags & (SAVENAME | SAVESTART)) == 0)
 				uma_zfree(namei_zone, cnp->cn_pnbuf);
 			else
@@ -456,14 +455,10 @@
 	 */
 unionlookup:
 #ifdef MAC
-	/*
-	 * Execute MAC lookup policy check here, in the heart of all
-	 * "sanctioned" lookup operations.
-	 */
 	error = mac_cred_check_lookup_vnode(td->td_ucred, dp, cnp);
 	if (error)
 		goto bad;
-#endif /* MAC */
+#endif
 	ndp->ni_dvp = dp;
 	ndp->ni_vp = NULL;
 	cnp->cn_flags &= ~PDIRUNLOCK;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message