From 177b077e577f98f2b7bd88f958248abb94e1cf2d Mon Sep 17 00:00:00 2001 From: Jamie Gritton Date: Wed, 26 Aug 2020 00:42:59 +0000 Subject: [PATCH] Handle jail.conf variables that have the same names as parameters. PR: 248444 Submitted by: Akos Somfai Reported by: Markus Stoff --- usr.sbin/jail/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index 234c4e25797..3d9fc92c99b 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -393,7 +393,8 @@ 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)) { + equalopts(name, intparams[ipnum].name) && + !(p->flags & PF_VAR)) { j->intparams[ipnum] = np; np->flags |= intparams[ipnum].flags; break; -- 2.45.0