From owner-p4-projects Thu Sep 19 5:48:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BF6E37B404; Thu, 19 Sep 2002 05:48:55 -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 1E15937B401; Thu, 19 Sep 2002 05:48:55 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB12643E3B; Thu, 19 Sep 2002 05:48:52 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g8JCmTOo066466; Thu, 19 Sep 2002 08:48:29 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Thu, 19 Sep 2002 08:48:29 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Adam Migus Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17686 for review In-Reply-To: <200209190051.g8J0peKG030717@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII 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 It would, at some point, be useful to figure out why the sysctl code panics if you do this, but now is probably not the moment. :-) Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Wed, 18 Sep 2002, Adam Migus wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17686 > > Change 17686 by amigus@amigus_caster on 2002/09/18 17:50:40 > > Fix crash when MAC_DEBUG is undefined. > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#270 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#270 (text+ko) ==== > > @@ -98,17 +98,6 @@ > > SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, > "TrustedBSD MAC policy controls"); > -SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, > - "TrustedBSD MAC debug info"); > -SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, > - "TrustedBSD MAC object counters"); > - > -static int mac_debug_label_fallback = 0; > -SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, > - &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" > - "when label is corrupted."); > -TUNABLE_INT("security.mac.debug_label_fallback", > - &mac_debug_label_fallback); > > #ifndef MAC_MAX_POLICIES > #define MAC_MAX_POLICIES 8 > @@ -178,6 +167,19 @@ > "copy-on-write semantics, or by removing all write access"); > > #ifdef MAC_DEBUG > +SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, > + "TrustedBSD MAC debug info"); > + > +static int mac_debug_label_fallback = 0; > +SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, > + &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" > + "when label is corrupted."); > +TUNABLE_INT("security.mac.debug_label_fallback", > + &mac_debug_label_fallback); > + > +SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, > + "TrustedBSD MAC object counters"); > + > static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, > nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, > nmacipqs, nmacpipes, nmacprocs; > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message