From aac8ea56d6329a3e32af9086f47946a9e16e1524 Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@FreeBSD.org>
Date: Mon, 17 Nov 2003 01:04:07 +0000
Subject: Don't implement mpo_destroy() for Biba, LOMAC, and MLS, as they
 aren't allowed to be unloaded.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, Network Associates Laboratories
---
 sys/security/mac_biba/mac_biba.c   | 7 -------
 sys/security/mac_lomac/mac_lomac.c | 7 -------
 sys/security/mac_mls/mac_mls.c     | 7 -------
 3 files changed, 21 deletions(-)

(limited to 'sys')

diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index 3ad8bd5..778532c 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -488,12 +488,6 @@ mac_biba_copy(struct mac_biba *source, struct mac_biba *dest)
  * Policy module operations.
  */
 static void
-mac_biba_destroy(struct mac_policy_conf *conf)
-{
-
-}
-
-static void
 mac_biba_init(struct mac_policy_conf *conf)
 {
 
@@ -2607,7 +2601,6 @@ mac_biba_check_vnode_write(struct ucred *active_cred,
 
 static struct mac_policy_ops mac_biba_ops =
 {
-	.mpo_destroy = mac_biba_destroy,
 	.mpo_init = mac_biba_init,
 	.mpo_init_bpfdesc_label = mac_biba_init_label,
 	.mpo_init_cred_label = mac_biba_init_label,
diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c
index 7c2f3cb..c3ec772 100644
--- a/sys/security/mac_lomac/mac_lomac.c
+++ b/sys/security/mac_lomac/mac_lomac.c
@@ -599,12 +599,6 @@ try_relabel(struct mac_lomac *from, struct mac_lomac *to)
  * Policy module operations.
  */
 static void
-mac_lomac_destroy(struct mac_policy_conf *conf)
-{
-
-}
-
-static void
 mac_lomac_init(struct mac_policy_conf *conf)
 {
 
@@ -2585,7 +2579,6 @@ mac_lomac_thread_userret(struct thread *td)
 
 static struct mac_policy_ops mac_lomac_ops =
 {
-	.mpo_destroy = mac_lomac_destroy,
 	.mpo_init = mac_lomac_init,
 	.mpo_init_bpfdesc_label = mac_lomac_init_label,
 	.mpo_init_cred_label = mac_lomac_init_label,
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
index 9edcad7..cdf92be 100644
--- a/sys/security/mac_mls/mac_mls.c
+++ b/sys/security/mac_mls/mac_mls.c
@@ -454,12 +454,6 @@ mac_mls_copy(struct mac_mls *source, struct mac_mls *dest)
  * Policy module operations.
  */
 static void
-mac_mls_destroy(struct mac_policy_conf *conf)
-{
-
-}
-
-static void
 mac_mls_init(struct mac_policy_conf *conf)
 {
 
@@ -2379,7 +2373,6 @@ mac_mls_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred,
 
 static struct mac_policy_ops mac_mls_ops =
 {
-	.mpo_destroy = mac_mls_destroy,
 	.mpo_init = mac_mls_init,
 	.mpo_init_bpfdesc_label = mac_mls_init_label,
 	.mpo_init_cred_label = mac_mls_init_label,
-- 
cgit v1.1