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

terminal: remove unneeded if condition
lxc · May 4, 2020 · a4327f2 · a4327f2
2 parents 466b8e7 + af25cae
commit a4327f2
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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);