d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle jail.conf variables that have the same names as parameters.

Browse Source 
PR:		248444
Submitted by:	Akos Somfai
Reported by:	Markus Stoff
This commit is contained in:
Jamie Gritton 2020-08-26 00:42:59 +00:00
parent 82178ae093
commit 177b077e57
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=364791
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/jail/config.c
View File

@ -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;