From owner-p4-projects@FreeBSD.ORG Tue Nov 11 20:08:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0DE816A4D0; Tue, 11 Nov 2003 20:08:20 -0800 (PST) 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 6914116A4CE for ; Tue, 11 Nov 2003 20:08:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 471EA43FBF for ; Tue, 11 Nov 2003 20:08:19 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAC48JXJ035601 for ; Tue, 11 Nov 2003 20:08:19 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAC48IVX035598 for perforce@freebsd.org; Tue, 11 Nov 2003 20:08:18 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Nov 2003 20:08:18 -0800 (PST) Message-Id: <200311120408.hAC48IVX035598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 42094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Nov 2003 04:08:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=42094 Change 42094 by rwatson@rwatson_tislabs on 2003/11/11 20:08:10 Biba, LOMAC, and MLS aren't unloadable, so don't implement a destroy method for these policies. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#230 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#76 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#185 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#230 (text+ko) ==== @@ -495,12 +495,6 @@ * Policy module operations. */ static void -mac_biba_destroy(struct mac_policy_conf *conf) -{ - -} - -static void mac_biba_init(struct mac_policy_conf *conf) { @@ -3113,7 +3107,6 @@ 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, ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#76 (text+ko) ==== @@ -616,12 +616,6 @@ * Policy module operations. */ static void -mac_lomac_destroy(struct mac_policy_conf *conf) -{ - -} - -static void mac_lomac_init(struct mac_policy_conf *conf) { @@ -3039,7 +3033,6 @@ 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, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#185 (text+ko) ==== @@ -460,12 +460,6 @@ * Policy module operations. */ static void -mac_mls_destroy(struct mac_policy_conf *conf) -{ - -} - -static void mac_mls_init(struct mac_policy_conf *conf) { @@ -2890,7 +2884,6 @@ 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,