svn commit: r277158 - head/sys/kern

[Jamie Gritton]

Author: jamie
Date: Wed Jan 14 03:52:41 2015
New Revision: 277158
URL: https://svnweb.freebsd.org/changeset/base/277158

Log:
  Don't set prison's pr_ip4s or pr_ip6s to -1.
  
  PR:		196474
  MFC after:	3 days

Modified:
  head/sys/kern/kern_jail.c

Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c	Wed Jan 14 02:18:29 2015	(r277157)
+++ head/sys/kern/kern_jail.c	Wed Jan 14 03:52:41 2015	(r277158)
@@ -800,7 +800,7 @@ kern_jail_set(struct thread *td, struct 
 #ifdef INET
 	error = vfs_getopt(opts, "ip4.addr", &op, &ip4s);
 	if (error == ENOENT)
-		ip4s = (pr_flags & PR_IP4_DISABLE) ? 0 : -1;
+		ip4s = 0;
 	else if (error != 0)
 		goto done_free;
 	else if (ip4s & (sizeof(*ip4) - 1)) {
@@ -858,7 +858,7 @@ kern_jail_set(struct thread *td, struct 
 #ifdef INET6
 	error = vfs_getopt(opts, "ip6.addr", &op, &ip6s);
 	if (error == ENOENT)
-		ip6s = (pr_flags & PR_IP6_DISABLE) ? 0 : -1;
+		ip6s = 0;
 	else if (error != 0)
 		goto done_free;
 	else if (ip6s & (sizeof(*ip6) - 1)) {