From b317d6f0aac1522a99ffc27448ff692f835ec57d Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 5 Nov 2002 16:44:29 +0000
Subject: [PATCH] Since neither the Biba policy nor the MLS policy make use of
 transitioning, remove their transition entry points.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, Network Associates Laboratories
---
 sys/security/mac_biba/mac_biba.c | 23 -----------------------
 sys/security/mac_mls/mac_mls.c   | 23 -----------------------
 2 files changed, 46 deletions(-)

diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index e66ba7bca803..c6dff49bce5c 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -1354,27 +1354,6 @@ mac_biba_create_cred(struct ucred *cred_parent, struct ucred *cred_child)
 	mac_biba_copy_range(source, dest);
 }
 
-static void
-mac_biba_execve_transition(struct ucred *old, struct ucred *new,
-    struct vnode *vp, struct label *vnodelabel)
-{
-	struct mac_biba *source, *dest;
-
-	source = SLOT(&old->cr_label);
-	dest = SLOT(&new->cr_label);
-
-	mac_biba_copy_single(source, dest);
-	mac_biba_copy_range(source, dest);
-}
-
-static int
-mac_biba_execve_will_transition(struct ucred *old, struct vnode *vp,
-    struct label *vnodelabel)
-{
-
-	return (0);
-}
-
 static void
 mac_biba_create_proc0(struct ucred *cred)
 {
@@ -2627,8 +2606,6 @@ static struct mac_policy_ops mac_biba_ops =
 	.mpo_relabel_ifnet = mac_biba_relabel_ifnet,
 	.mpo_update_ipq = mac_biba_update_ipq,
 	.mpo_create_cred = mac_biba_create_cred,
-	.mpo_execve_transition = mac_biba_execve_transition,
-	.mpo_execve_will_transition = mac_biba_execve_will_transition,
 	.mpo_create_proc0 = mac_biba_create_proc0,
 	.mpo_create_proc1 = mac_biba_create_proc1,
 	.mpo_relabel_cred = mac_biba_relabel_cred,
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
index e9678a3ea709..71da5da0c40c 100644
--- a/sys/security/mac_mls/mac_mls.c
+++ b/sys/security/mac_mls/mac_mls.c
@@ -1281,27 +1281,6 @@ mac_mls_create_cred(struct ucred *cred_parent, struct ucred *cred_child)
 	mac_mls_copy_range(source, dest);
 }
 
-static void
-mac_mls_execve_transition(struct ucred *old, struct ucred *new,
-    struct vnode *vp, struct label *vnodelabel)
-{
-	struct mac_mls *source, *dest;
-
-	source = SLOT(&old->cr_label);
-	dest = SLOT(&new->cr_label);
-
-	mac_mls_copy_single(source, dest);
-	mac_mls_copy_range(source, dest);
-}
-
-static int
-mac_mls_execve_will_transition(struct ucred *old, struct vnode *vp,
-    struct label *vnodelabel)
-{
-
-	return (0);
-}
-
 static void
 mac_mls_create_proc0(struct ucred *cred)
 {
@@ -2445,8 +2424,6 @@ static struct mac_policy_ops mac_mls_ops =
 	.mpo_relabel_ifnet = mac_mls_relabel_ifnet,
 	.mpo_update_ipq = mac_mls_update_ipq,
 	.mpo_create_cred = mac_mls_create_cred,
-	.mpo_execve_transition = mac_mls_execve_transition,
-	.mpo_execve_will_transition = mac_mls_execve_will_transition,
 	.mpo_create_proc0 = mac_mls_create_proc0,
 	.mpo_create_proc1 = mac_mls_create_proc1,
 	.mpo_relabel_cred = mac_mls_relabel_cred,