picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

machinectl: fix success check when getting pty from within container

Browse source
This commit is contained in:
Lennart Poettering 2013-12-23 19:15:43 +01:00
parent 94a6ce5b7c
commit 6261f11fc3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/machine/machinectl.c
View file

@ -452,10 +452,7 @@ static int openpt_in_namespace(pid_t pid, int flags) {
pair[1] = -1;
r = wait_for_terminate(child, &si);
if (r < 0 || si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS || master < 0) {
if (master >= 0)
close_nointr_nofail(master);
if (r < 0 || si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS) {
return r < 0 ? r : -EIO;
}
@ -479,6 +476,9 @@ static int openpt_in_namespace(pid_t pid, int flags) {
master = fds[0];
}
if (master < 0)
return -EIO;
return master;
}