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

terminal: remove unneeded if condition

Merge pull request #3398 from brauner/2020-05-04/fixes
a4327f2a · Stéphane Graber · GitHub · 466b8e7f · af25cae4 · a4327f2a
Unverified Commit a4327f2a authored May 04, 2020 by Stéphane Graber Committed by GitHub May 04, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

terminal.c src/lxc/terminal.c +1 -4

No files found.
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -1167,10 +1167,7 @@ int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_terminal *terminal)
 	if (strcmp(terminal->name, "") == 0)
 		return 0;

-	if (terminal->slave >= 0)
-		ret = userns_exec_mapped_root(terminal->name, terminal->slave, c);
-	else
-		ret = userns_exec_mapped_root(terminal->name, terminal->slave, c);
+	ret = userns_exec_mapped_root(terminal->name, terminal->slave, c);
 	if (ret < 0) {
 		return log_error(-1, "Failed to chown terminal %d(%s)",
 				 terminal->slave, terminal->name);