aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/jls
diff options
context:
space:
mode:
authorJamie Gritton <jamie@FreeBSD.org>2015-02-22 00:00:10 +0000
committerJamie Gritton <jamie@FreeBSD.org>2015-02-22 00:00:10 +0000
commitb2ea411de20ede438bda523f14475538d7e08e0a (patch)
tree4e490083bd289c7d37fdd38dad91a9fa509833b6 /usr.sbin/jls
parentade9ccfe211ac8b27c58a4dc11a6cd1d33767ce0 (diff)
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
Notes
Notes: svn path=/head/; revision=279123
Diffstat (limited to 'usr.sbin/jls')
-rw-r--r--usr.sbin/jls/jls.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c
index 8e5512d73351..b1e28fbd1362 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;
}