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

terminal: lxc_terminal_prepare_login()

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

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index 04ff172cd..d3b7d342b 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -958,7 +958,7 @@ static int attach_child_main(struct attach_clone_payload *payload)
 	}
 
 	if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) {
-		ret = lxc_login_pty(payload->pty_fd);
+		ret = lxc_terminal_prepare_login(payload->pty_fd);
 		if (ret < 0) {
 			SYSERROR("Failed to prepare pty file descriptor %d", payload->pty_fd);
 			goto on_error;
diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index 58fcdce4b..0659a105c 100644
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -1144,7 +1144,7 @@ int lxc_make_controlling_terminal(int fd)
 	return 0;
 }
 
-int lxc_login_pty(int fd)
+int lxc_terminal_prepare_login(int fd)
 {
 	int ret;
 
diff --git a/src/lxc/terminal.h b/src/lxc/terminal.h
index 79ee4a1d1..90703988f 100644
--- a/src/lxc/terminal.h
+++ b/src/lxc/terminal.h
@@ -282,7 +282,7 @@ extern int lxc_terminal_io_cb(int fd, uint32_t events, void *data,
 			      struct lxc_epoll_descr *descr);
 
 extern int lxc_make_controlling_terminal(int fd);
-extern int lxc_login_pty(int fd);
+extern int lxc_terminal_prepare_login(int fd);
 extern void lxc_terminal_conf_free(struct lxc_terminal *console);
 extern void lxc_terminal_info_init(struct lxc_terminal_info *pty);
 extern void lxc_terminal_init(struct lxc_terminal *pty);