PERFORCE change 19352 for review

[Brian Feldman]

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

Change 19352 by green at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message