diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-12-06 15:58:50 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-12-06 15:58:50 +0000 |
| commit | b8f71f97509ecca21af9c82fd60c76be44af55a7 (patch) | |
| tree | 888730e4bb13158c3310f87308b742c158fc1cfe /sbin | |
| parent | c6bfc8968df9eee0452db8f70472e4bbf68e7b90 (diff) | |
| download | src-test2-b8f71f97509ecca21af9c82fd60c76be44af55a7.tar.gz src-test2-b8f71f97509ecca21af9c82fd60c76be44af55a7.zip | |
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
Notes
Notes:
svn path=/head/; revision=368388
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/bectl/bectl_jail.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sbin/bectl/bectl_jail.c b/sbin/bectl/bectl_jail.c index c01c4ebabd36..1d7d4a1496a2 100644 --- a/sbin/bectl/bectl_jail.c +++ b/sbin/bectl/bectl_jail.c @@ -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 |