From owner-p4-projects  Thu Aug  1  8:15:39 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D984A37B401; Thu,  1 Aug 2002 08:15:32 -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 71B1737B400
	for <perforce@freebsd.org>; Thu,  1 Aug 2002 08:15:32 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2ED0D43E3B
	for <perforce@freebsd.org>; Thu,  1 Aug 2002 08:15:32 -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 g71FFWJU078132
	for <perforce@freebsd.org>; Thu, 1 Aug 2002 08:15:32 -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 g71FFV91078129
	for perforce@freebsd.org; Thu, 1 Aug 2002 08:15:31 -0700 (PDT)
Date: Thu, 1 Aug 2002 08:15:31 -0700 (PDT)
Message-Id: <200208011515.g71FFV91078129@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 15385 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=15385

Change 15385 by rwatson@rwatson_paprika on 2002/08/01 08:14:33

	Remove dups from integ.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#30 edit

Differences ...

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

@@ -30,7 +30,6 @@
 #include "opt_mac.h"
 
 #include <sys/param.h>
-#include <sys/mac.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -988,17 +987,6 @@
 	if (error)
 		return (error);
 
-#ifdef MAC
-	/*
-	 * Check that we can execute the file, and hold onto the lock so
-	 * that the label is retained for use later for MAC models that
-	 * support subject domain transitions at execve()-time.
-	 */
-	error = mac_check_vnode_exec(curthread->td_ucred, imgp->vp);
-	if (error)
-		return (error);
-#endif
-
 	/*
 	 * Check number of open-for-writes on the file and deny execution
 	 * if there are any.

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