Skip to content

L
lxc
Unverified Commit a4327f2a by Stéphane Graber Committed by GitHub
Options

Merge pull request #3398 from brauner/2020-05-04/fixes

terminal: remove unneeded if condition
parents 466b8e7f af25cae4
Showing with 1 addition and 4 deletions
src/lxc/terminal.c
...@@ -1167,10 +1167,7 @@ int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_terminal *terminal) ...@@ -1167,10 +1167,7 @@ int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_terminal *terminal)
if (strcmp(terminal->name, "") == 0) if (strcmp(terminal->name, "") == 0)
return 0; return 0;
if (terminal->slave >= 0) ret = userns_exec_mapped_root(terminal->name, terminal->slave, c);
ret = userns_exec_mapped_root(terminal->name, terminal->slave, c);
else
ret = userns_exec_mapped_root(terminal->name, terminal->slave, c);
if (ret < 0) { if (ret < 0) {
return log_error(-1, "Failed to chown terminal %d(%s)", return log_error(-1, "Failed to chown terminal %d(%s)",
terminal->slave, terminal->name); terminal->slave, terminal->name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment