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 fd21a0a815709e96d706506aa102338e2d4bd05d..b3a70188a468130703bcea24fef2ce3d22e00aa8 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -304,10 +304,8 @@ static int show(sd_bus *bus, char **args, unsigned n) {
                 /* If no argument is specified, inspect the manager
                  * itself */
                 r = show_properties(bus, "/org/freedesktop/machine1", &new_line);
-                if (r < 0) {
-                        log_error("Failed to query properties: %s", strerror(-r));
+                if (r < 0)
                         return r;
-                }
         }
 
         for (i = 1; i < n; i++) {
@@ -453,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;
 
@@ -472,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;
 }