Handle jail.conf variables that have the same names as parameters.
PR: 248444 Submitted by: Akos Somfai Reported by: Markus Stoff
This commit is contained in:
parent
82178ae093
commit
177b077e57
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=364791
@ -393,7 +393,8 @@ add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum,
|
|||||||
else
|
else
|
||||||
for (ipnum = IP__NULL + 1; ipnum < IP_NPARAM; ipnum++)
|
for (ipnum = IP__NULL + 1; ipnum < IP_NPARAM; ipnum++)
|
||||||
if (!(intparams[ipnum].flags & PF_CONV) &&
|
if (!(intparams[ipnum].flags & PF_CONV) &&
|
||||||
equalopts(name, intparams[ipnum].name)) {
|
equalopts(name, intparams[ipnum].name) &&
|
||||||
|
!(p->flags & PF_VAR)) {
|
||||||
j->intparams[ipnum] = np;
|
j->intparams[ipnum] = np;
|
||||||
np->flags |= intparams[ipnum].flags;
|
np->flags |= intparams[ipnum].flags;
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user