Date: Sat, 17 Jan 2015 01:16:25 +0000 (UTC) From: Jamie Gritton <jamie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r277280 - stable/9/sys/kern Message-ID: <201501170116.t0H1GP5m010377@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jamie Date: Sat Jan 17 01:16:24 2015 New Revision: 277280 URL: https://svnweb.freebsd.org/changeset/base/277280 Log: MFC r277158: Don't set prison's pr_ip4s or pr_ip6s to -1. PR: 196474 Modified: stable/9/sys/kern/kern_jail.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/kern/kern_jail.c ============================================================================== --- stable/9/sys/kern/kern_jail.c Sat Jan 17 01:16:03 2015 (r277279) +++ stable/9/sys/kern/kern_jail.c Sat Jan 17 01:16:24 2015 (r277280) @@ -797,7 +797,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)) { @@ -855,7 +855,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)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501170116.t0H1GP5m010377>