machinectl: fix success check when getting pty from within container

[elogind.git] / src / machine / machinectl.c

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index a2af87c17d2ccea40f9e76cab6375e7978a52d25..b3a70188a468130703bcea24fef2ce3d22e00aa8 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -451,6 +451,12 @@ static int openpt_in_namespace(pid_t pid, int flags) {
         close_nointr_nofail(pair[1]);
         pair[1] = -1;
 
+        r = wait_for_terminate(child, &si);
+        if (r < 0 || si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS) {
+
+                return r < 0 ? r : -EIO;
+        }
+
         if (recvmsg(pair[0], &mh, MSG_NOSIGNAL|MSG_CMSG_CLOEXEC) < 0)
                 return -errno;
 
@@ -470,14 +476,8 @@ static int openpt_in_namespace(pid_t pid, int flags) {
                         master = fds[0];
                 }
 
-        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);
-
-                return r < 0 ? r : -EIO;
-        }
+        if (master < 0)
+                return -EIO;
 
         return master;
 }