PERFORCE change 17686 for review

[Robert Watson]

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 at 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 at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message