Index: defaults/periodic.conf
===================================================================
RCS file: /donald/repo/FreeBSD/src/etc/defaults/periodic.conf,v
retrieving revision 1.33
diff -u -p -r1.33 periodic.conf
--- defaults/periodic.conf	24 Jan 2005 22:21:13 -0000	1.33
+++ defaults/periodic.conf	23 Sep 2005 16:25:25 -0000
@@ -22,6 +22,12 @@ periodic_conf_files="/etc/periodic.conf 
 # periodic script dirs
 local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic"
 
+# Use $nojail for things that are not intended to be run inside a jail.
+nojail="YES"
+if [ `sysctl -n security.jail.jailed` -eq 1 ]
+then
+	nojail="NO"
+fi
 
 # Daily options
 
@@ -148,25 +154,25 @@ daily_status_security_chkuid0_enable="YE
 daily_status_security_passwdless_enable="YES"
 
 # 500.ipfwdenied
-daily_status_security_ipfwdenied_enable="YES"
+daily_status_security_ipfwdenied_enable="$nojail"
 
 # 510.ipfdenied
-daily_status_security_ipfdenied_enable="YES"
+daily_status_security_ipfdenied_enable="$nojail"
 
 # 520.pfdenied
-daily_status_security_pfdenied_enable="YES"
+daily_status_security_pfdenied_enable="$nojail"
 
 # 550.ipfwlimit
-daily_status_security_ipfwlimit_enable="YES"
+daily_status_security_ipfwlimit_enable="$nojail"
 
 # 600.ip6fwdenied
-daily_status_security_ip6fwdenied_enable="YES"
+daily_status_security_ip6fwdenied_enable="$nojail"
 
 # 610.ipf6denied
-daily_status_security_ipf6denied_enable="YES"
+daily_status_security_ipf6denied_enable="$nojail"
 
 # 650.ip6fwlimit
-daily_status_security_ip6fwlimit_enable="YES"
+daily_status_security_ip6fwlimit_enable="$nojail"
 
 # 700.kernelmsg
 daily_status_security_kernelmsg_enable="YES"