proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 20:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
terminal: remove unneeded if condition
This commit is contained in:
Stéphane Graber 2020-05-04 13:38:43 -04:00 committed by GitHub
commit a4327f2aa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lxc/terminal.c
View File

@ -1167,9 +1167,6 @@ 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);
else
ret = userns_exec_mapped_root(terminal->name, terminal->slave, c); 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)",