svn commit: r277279 - stable/10/sys/kern

[Jamie Gritton]

Author: jamie
Date: Sat Jan 17 01:16:03 2015
New Revision: 277279
URL: https://svnweb.freebsd.org/changeset/base/277279

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

Modified:
  stable/10/sys/kern/kern_jail.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_jail.c
==============================================================================
--- stable/10/sys/kern/kern_jail.c	Sat Jan 17 00:58:24 2015	(r277278)
+++ stable/10/sys/kern/kern_jail.c	Sat Jan 17 01:16:03 2015	(r277279)
@@ -799,7 +799,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)) {
@@ -857,7 +857,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)) {