From owner-p4-projects  Tue Oct 15 14:33:41 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BEFCC37B404; Tue, 15 Oct 2002 14:33:38 -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 6DE4337B401
	for <perforce@freebsd.org>; Tue, 15 Oct 2002 14:33:38 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 290F643E88
	for <perforce@freebsd.org>; Tue, 15 Oct 2002 14:33:38 -0700 (PDT)
	(envelope-from green@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9FLXbMt010517
	for <perforce@freebsd.org>; Tue, 15 Oct 2002 14:33:37 -0700 (PDT)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.3/Submit) id g9FLXbd4010514
	for perforce@freebsd.org; Tue, 15 Oct 2002 14:33:37 -0700 (PDT)
Date: Tue, 15 Oct 2002 14:33:37 -0700 (PDT)
Message-Id: <200210152133.g9FLXbd4010514@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 19352 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://perforce.freebsd.org/chv.cgi?CH=19352

Change 19352 by green@green_laptop_2 on 2002/10/15 14:32:37

	Shouldn't have submitted this change, but perforce made me.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#39 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#39 (text+ko) ====

@@ -297,8 +297,7 @@
 
 static void
 sebsd_execve_transition(struct ucred *old, struct ucred *new,
-			struct vnode *vp, struct mac *vnodelabel,
-			struct vnode *shellvp, struct mac *shellvnodelabel)
+			struct vnode *vp, struct mac *vnodelabel)
 {
 	struct task_security_struct *otask, *ntask;
 	struct vnode_security_struct *file;
@@ -306,10 +305,7 @@
 
 	otask = SLOT(&old->cr_label);
 	ntask = SLOT(&new->cr_label);
-	if (shellvp != NULL)
-		file = SLOT(&shellvp->v_label);
-	else
-		file = SLOT(&vp->v_label);
+	file = SLOT(&vp->v_label);
 
 	/*
 	 * Should have already checked all the permissions
@@ -335,8 +331,7 @@
 
 static int
 sebsd_execve_will_transition(struct ucred *old, struct vnode *vp,
-			     struct mac *vnodelabel, struct vnode *shellvp,
-			     struct mac *shellvnodelabel)
+			     struct mac *vnodelabel)
 {
 	struct task_security_struct *task;
 	struct vnode_security_struct *file;
@@ -344,10 +339,7 @@
 	int rc;
 
 	task = SLOT(&old->cr_label);
-	if (shellvp != NULL)
-		file = SLOT(&shellvp->v_label);
-	else
-		file = SLOT(&vp->v_label);
+	file = SLOT(&vp->v_label);
 
 	/*
 	 * Should have already checked all the permissions, so just see if

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