aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Gritton <jamie@FreeBSD.org>2020-08-26 18:35:32 +0000
committerJamie Gritton <jamie@FreeBSD.org>2020-08-26 18:35:32 +0000
commit48c376a6f17f97c66ece45053ee18cf8b80f4e0e (patch)
treeedf05190e498b26778e6217bc149e8ba1034a10c
parent0fec8f03cf996be5d4c9d770a7c47aae5e5aaee8 (diff)
downloadsrc-48c376a6f17f97c66ece45053ee18cf8b80f4e0e.tar.gz
src-48c376a6f17f97c66ece45053ee18cf8b80f4e0e.zip
Back out r364791 to unbreak jails. Lesson learned: "compile and test" means
running the test on the same executable that you just compiled. PR: 248444 Pointy hat to: jamie
Notes
Notes: svn path=/head/; revision=364828
-rw-r--r--usr.sbin/jail/config.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c
index 3d9fc92c99bb..234c4e257976 100644
--- a/usr.sbin/jail/config.c
+++ b/usr.sbin/jail/config.c
@@ -393,8 +393,7 @@ add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum,
else
for (ipnum = IP__NULL + 1; ipnum < IP_NPARAM; ipnum++)
if (!(intparams[ipnum].flags & PF_CONV) &&
- equalopts(name, intparams[ipnum].name) &&
- !(p->flags & PF_VAR)) {
+ equalopts(name, intparams[ipnum].name)) {
j->intparams[ipnum] = np;
np->flags |= intparams[ipnum].flags;
break;