From 48c376a6f17f97c66ece45053ee18cf8b80f4e0e Mon Sep 17 00:00:00 2001 From: Jamie Gritton Date: Wed, 26 Aug 2020 18:35:32 +0000 Subject: [PATCH] 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 --- usr.sbin/jail/config.c | 3 +-- 1 file changed, 1 insertion(+), 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;