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

Allow for parameters added with the JP_OPT flag to not exist.

Browse Source 
That's why the flag exists in the first place.

MFC after:	1 week
This commit is contained in:
Jamie Gritton 2015-02-22 00:00:10 +00:00
parent ade9ccfe21
commit b2ea411de2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=279123
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/jls/jls.c
View File

@ -294,10 +294,8 @@ add_param(const char *name, void *value, size_t valuelen,
param->jp_flags |= flags;
return param - params;
}
if (jailparam_init(param, name) < 0)
errx(1, "%s", jail_errmsg);
param->jp_flags = flags;
if ((value != NULL ? jailparam_import_raw(param, value, valuelen)
if (jailparam_init(param, name) < 0 ||
(value != NULL ? jailparam_import_raw(param, value, valuelen)
: jailparam_import(param, value)) < 0) {
if (flags & JP_OPT) {
nparams--;
@ -305,6 +303,7 @@ add_param(const char *name, void *value, size_t valuelen,
}
errx(1, "%s", jail_errmsg);
}
param->jp_flags = flags;
return param - params;
}