From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 28 Feb 2018 11:49:45 +0000 (+0100)
Subject: terminal: lxc_terminal_map_ids()
X-Git-Tag: lxc-3.0.0.beta1~4^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03700cab61c404709a0034af4baf46a9907dbc6e;p=thirdparty%2Flxc.git

terminal: lxc_terminal_map_ids()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index 0659a105c..893237c6e 100644
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -1188,24 +1188,23 @@ void lxc_terminal_conf_free(struct lxc_terminal *terminal)
 		lxc_ringbuf_release(&terminal->ringbuf);
 }
 
-int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_terminal *pty)
+int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_terminal *terminal)
 {
 	int ret;
 
 	if (lxc_list_empty(&c->id_map))
 		return 0;
 
-	ret = strcmp(pty->name, "");
-	if (ret == 0)
+	if (strcmp(terminal->name, "") == 0)
 		return 0;
 
-	ret = chown_mapped_root(pty->name, c);
+	ret = chown_mapped_root(terminal->name, c);
 	if (ret < 0) {
-		ERROR("Failed to chown \"%s\"", pty->name);
+		ERROR("Failed to chown terminal \"%s\"", terminal->name);
 		return -1;
 	}
 
-	TRACE("Chowned \"%s\"", pty->name);
+	TRACE("Chowned terminal \"%s\"", terminal->name);
 
 	return 0;
 }