From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 18 Nov 2020 20:06:37 +0000 (+0100)
Subject: commands_utils: fix lxc-wait
X-Git-Tag: lxc-5.0.0~337^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2bab66fa9f5ce742bd1729f4710b2a06726bdd6;p=thirdparty%2Flxc.git

commands_utils: fix lxc-wait

Closes: #3570
Fixes: 7792a5b60f79 ("commands: add additional check to lxc_cmd_sock_get_state()")
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/commands_utils.c b/src/lxc/commands_utils.c
index 2af722ca1..cba8e9c10 100644
--- a/src/lxc/commands_utils.c
+++ b/src/lxc/commands_utils.c
@@ -62,7 +62,7 @@ int lxc_cmd_sock_get_state(const char *name, const char *lxcpath,
 
 	ret = lxc_cmd_add_state_client(name, lxcpath, states, &state_client_fd);
 	if (ret < 0)
-		return ret_errno(EINVAL);
+		return -errno;
 
 	if (ret < MAX_STATE)
 		return ret;
diff --git a/src/lxc/state.c b/src/lxc/state.c
index 28ab60c4b..d131e2ebe 100644
--- a/src/lxc/state.c
+++ b/src/lxc/state.c
@@ -100,10 +100,8 @@ int lxc_wait(const char *lxcname, const char *states, int timeout,
 		if (state >= 0)
 			break;
 
-		if (errno != ECONNREFUSED) {
-			SYSERROR("Failed to receive state from monitor");
-			return -1;
-		}
+		if (errno != ECONNREFUSED)
+			return log_error_errno(-1, errno, "Failed to receive state from monitor");
 
 		if (timeout > 0)
 			timeout--;