From owner-p4-projects Sat Oct 19 17:24: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B24437B404; Sat, 19 Oct 2002 17:24:00 -0700 (PDT) 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 13FEB37B401 for ; Sat, 19 Oct 2002 17:24:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C217643E91 for ; Sat, 19 Oct 2002 17:23:59 -0700 (PDT) (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.6/8.12.6) with ESMTP id g9K0NdmV096743 for ; Sat, 19 Oct 2002 17:23:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9K0NcpN096740 for perforce@freebsd.org; Sat, 19 Oct 2002 17:23:38 -0700 (PDT) Date: Sat, 19 Oct 2002 17:23:38 -0700 (PDT) Message-Id: <200210200023.g9K0NcpN096740@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 Subject: PERFORCE change 19665 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19665 Change 19665 by rwatson@rwatson_paprika on 2002/10/19 17:23:15 If MAC_MAX_POLICIES isn't defined globally, we have big problems, so don't conditionally define it. Remove trailing whitespace. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#316 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#316 (text+ko) ==== @@ -101,12 +101,10 @@ SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, "TrustedBSD MAC policy controls"); -#ifndef MAC_MAX_POLICIES -#define MAC_MAX_POLICIES 8 -#endif #if MAC_MAX_POLICIES > 32 #error "MAC_MAX_POLICIES too large" #endif + static unsigned int mac_max_policies = MAC_MAX_POLICIES; static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1; SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, @@ -3340,9 +3338,9 @@ if (!mac_enforce_socket) return (0); - + MAC_CHECK(check_socket_visible, cred, socket, &socket->so_label); - + return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message