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

Back out r364791 to unbreak jails. Lesson learned: "compile and test" means

Browse Source 
running the test on the same executable that you just compiled.

PR:		248444
Pointy hat to:	jamie
This commit is contained in:
Jamie Gritton 2020-08-26 18:35:32 +00:00
parent 0fec8f03cf
commit 48c376a6f1
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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