From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 25 Aug 2018 04:17:49 +0000 (+0200)
Subject: commands: return -1 on lxc_cmd_get_init_pid() err
X-Git-Tag: lxc-3.1.0~128^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ed8a6265bcd8958f0d026b2168bd6ee2ea61b68;p=thirdparty%2Flxc.git

commands: return -1 on lxc_cmd_get_init_pid() err

A while back the whole lxc_cmd() infrastructure was changed to return
meaningful negative error codes. But lxc_cmd_get_init_pid() should always
return -1. Make it so!

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Reported-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 30d6b6047..63a8949a6 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -381,7 +381,7 @@ pid_t lxc_cmd_get_init_pid(const char *name, const char *lxcpath)
 
 	ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL);
 	if (ret < 0)
-		return ret;
+		return -1;
 
 	return PTR_TO_INT(cmd.rsp.data);
 }