diff options
| author | jamie <jamie@FreeBSD.org> | 2015-02-22 00:00:10 +0000 |
|---|---|---|
| committer | jamie <jamie@FreeBSD.org> | 2015-02-22 00:00:10 +0000 |
| commit | 2aa717eb37d45980269447d27ee3695f6e4ee3b1 (patch) | |
| tree | 4e490083bd289c7d37fdd38dad91a9fa509833b6 /usr.sbin/jls | |
| parent | 0ea1b83e3703e39c50804c558e396324cec66c74 (diff) | |
| download | FreeBSD-src-2aa717eb37d45980269447d27ee3695f6e4ee3b1.zip FreeBSD-src-2aa717eb37d45980269447d27ee3695f6e4ee3b1.tar.gz | |
Allow for parameters added with the JP_OPT flag to not exist.
That's why the flag exists in the first place.
MFC after: 1 week
Diffstat (limited to 'usr.sbin/jls')
| -rw-r--r-- | usr.sbin/jls/jls.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c index 8e5512d..b1e28fb 100644 --- a/usr.sbin/jls/jls.c +++ b/usr.sbin/jls/jls.c @@ -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; } |
