Index: etc/defaults/rc.conf
===================================================================
RCS file: /ncvs/src/etc/defaults/rc.conf,v
retrieving revision 1.328
diff -u -r1.328 rc.conf
--- etc/defaults/rc.conf	6 Mar 2008 14:01:10 -0000	1.328
+++ etc/defaults/rc.conf	24 Mar 2008 17:36:04 -0000
@@ -583,9 +583,6 @@
 ##############################################################
 jail_enable="NO"	# Set to NO to disable starting of any jails
 jail_list=""		# Space separated list of names of jails
-jail_set_hostname_allow="YES" # Allow root user in a jail to change its hostname
-jail_socket_unixiproute_only="YES" # Route only TCP/IP within a jail
-jail_sysvipc_allow="NO"	# Allow SystemV IPC use from within a jail
 
 #
 # To use rc's built-in jail infrastructure create entries for
Index: etc/rc.d/jail
===================================================================
RCS file: /ncvs/src/etc/rc.d/jail,v
retrieving revision 1.38
diff -u -r1.38 jail
--- etc/rc.d/jail	13 Jan 2008 14:27:53 -0000	1.38
+++ etc/rc.d/jail	24 Mar 2008 17:36:04 -0000
@@ -130,33 +130,6 @@
 
 }
 
-# set_sysctl rc_knob mib msg
-#	If the mib sysctl is set according to what rc_knob
-#	specifies, this function does nothing. However if
-#	rc_knob is set differently than mib, then the mib
-#	is set accordingly and msg is displayed followed by
-#	an '=" sign and the word 'YES' or 'NO'.
-#
-set_sysctl()
-{
-	_knob="$1"
-	_mib="$2"
-	_msg="$3"
-
-	_current=`${SYSCTL} -n $_mib 2>/dev/null`
-	if checkyesno $_knob ; then
-		if [ "$_current" -ne 1 ]; then
-			echo -n " ${_msg}=YES"
-			${SYSCTL_W} 1>/dev/null ${_mib}=1
-		fi
-	else
-		if [ "$_current" -ne 0 ]; then
-			echo -n " ${_msg}=NO"
-			${SYSCTL_W} 1>/dev/null ${_mib}=0
-		fi
-	fi
-}
-
 # is_current_mountpoint()
 #	Is the directory mount point for a currently mounted file
 #	system?
@@ -275,15 +248,6 @@
 
 jail_start()
 {
-	echo -n 'Configuring jails:'
-	set_sysctl jail_set_hostname_allow security.jail.set_hostname_allowed \
-	    set_hostname_allow
-	set_sysctl jail_socket_unixiproute_only \
-	    security.jail.socket_unixiproute_only unixiproute_only
-	set_sysctl jail_sysvipc_allow security.jail.sysvipc_allowed \
-	    sysvipc_allow
-	echo '.'
-
 	echo -n 'Starting jails:'
 	_tmp_dir=`mktemp -d /tmp/jail.XXXXXXXX` || \
 	    err 3 "$name: Can't create temp dir, exiting..."
Index: share/man/man5/rc.conf.5
===================================================================
RCS file: /ncvs/src/share/man/man5/rc.conf.5,v
retrieving revision 1.327
diff -u -r1.327 rc.conf.5
--- share/man/man5/rc.conf.5	6 Sep 2007 21:00:48 -0000	1.327
+++ share/man/man5/rc.conf.5	24 Mar 2008 17:36:04 -0000
@@ -3412,23 +3412,6 @@
 .Dq Li /bin/sh /etc/rc.shutdown
 by default.
 This is the command executed at jail shutdown.
-.It Va jail_set_hostname_allow
-.Pq Vt bool
-If set to
-.Dq Li NO ,
-do not allow the root user in a jail to set its hostname.
-.It Va jail_socket_unixiproute_only
-.Pq Vt bool
-If set to
-.Dq Li YES ,
-do not allow any sockets,
-besides UNIX/IP/route sockets,
-to be used within a jail.
-.It Va jail_sysvipc_allow
-.Pq Vt bool
-If set to
-.Dq Li YES ,
-allow applications within a jail to use System V IPC.
 .\" ----- ISDN settings ---------------------------------
 .It Va isdn_enable
 .Pq Vt bool