Date: Mon, 21 Oct 2002 10:11:14 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 19804 for review Message-ID: <200210211711.g9LHBEmv017076@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=19804 Change 19804 by rwatson@rwatson_paprika on 2002/10/21 10:10:48 Loop back a few more nits from the main tree to the TrustedBSD base tree for specific files I'm merging. Affected files ... .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#11 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#10 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#11 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.21 2002/10/21 16:39:11 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.22 2002/10/21 17:05:48 rwatson Exp $ */ /* @@ -107,11 +107,10 @@ &ptys_equal, 0, "Label pty devices as biba/equal on create"); TUNABLE_INT("security.mac.biba.ptys_equal", &ptys_equal); -static int mac_biba_revocation_enabled = 0; +static int revocation_enabled = 0; SYSCTL_INT(_security_mac_biba, OID_AUTO, revocation_enabled, CTLFLAG_RW, - &mac_biba_revocation_enabled, 0, "Revoke access to objects on relabel"); -TUNABLE_INT("security.mac.biba.revocation_enabled", - &mac_biba_revocation_enabled); + &revocation_enabled, 0, "Revoke access to objects on relabel"); +TUNABLE_INT("security.mac.biba.revocation_enabled", &revocation_enabled); static int mac_biba_slot; #define SLOT(l) ((struct mac_biba *)LABEL_TO_SLOT((l), mac_biba_slot).l_ptr) @@ -267,7 +266,7 @@ if (mac_biba->mb_rangelow.mbe_type == MAC_BIBA_TYPE_EQUAL) return (1); if (mac_biba->mb_rangehigh.mbe_type == MAC_BIBA_TYPE_EQUAL) - return (1); + return (1); } return (0); @@ -1703,7 +1702,7 @@ * Rely on the use of open()-time protections to handle * non-revocation cases. */ - if (!mac_biba_enabled || !mac_biba_revocation_enabled) + if (!mac_biba_enabled || !revocation_enabled) return (0); subj = SLOT(&cred->cr_label); @@ -1752,7 +1751,7 @@ { struct mac_biba *subj, *obj; - if (!mac_biba_enabled || !mac_biba_revocation_enabled) + if (!mac_biba_enabled || !revocation_enabled) return (0); subj = SLOT(&active_cred->cr_label); @@ -1770,7 +1769,7 @@ { struct mac_biba *subj, *obj; - if (!mac_biba_enabled || !mac_biba_revocation_enabled) + if (!mac_biba_enabled || !revocation_enabled) return (0); subj = SLOT(&active_cred->cr_label); @@ -2072,7 +2071,7 @@ { struct mac_biba *subj, *obj; - if (!mac_biba_enabled || !mac_biba_revocation_enabled) + if (!mac_biba_enabled || !revocation_enabled) return (0); subj = SLOT(&active_cred->cr_label); ==== //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#10 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.18 2002/10/21 16:39:12 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.19 2002/10/21 17:01:30 rwatson Exp $ */ /* @@ -1064,7 +1064,7 @@ * new range label must be in the current range. */ if (new->mm_flags & MAC_MLS_FLAG_RANGE && - !mac_mls_range_in_range(new, subj)) + !mac_mls_range_in_range(new, subj)) return (EPERM); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210211711.g9LHBEmv017076>