bectl: simplify the tail end of the jail cmd

This has already confused me once (and I'm pretty sure I wrote it), so let's
clarify: unjailing after the command has completed will only happen if we're
interactive and -U has not been specified.

This just folds two conditionals together to make it obvious how -b/-U
interact with each other.

MFC after:	3 days
This commit is contained in:
Kyle Evans 2020-12-06 15:58:50 +00:00
parent c6bfc8968d
commit b8f71f9750
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=368388

View File

@ -356,10 +356,8 @@ bectl_cmd_jail(int argc, char *argv[])
}
free(jargv);
if (!interactive)
return (0);
if (unjail) {
/* Non-interactive (-b) mode means the jail sticks around. */
if (interactive && unjail) {
/*
* We're not checking the jail id result here because in the
* case of invalid param, or last command in jail was an error