console: lxc_terminal_map_ids()

parent aed105d5
...@@ -987,7 +987,7 @@ static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty) ...@@ -987,7 +987,7 @@ static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty)
} }
/* Shift ttys to container. */ /* Shift ttys to container. */
ret = lxc_pty_map_ids(conf, pty); ret = lxc_terminal_map_ids(conf, pty);
if (ret < 0) { if (ret < 0) {
ERROR("Failed to shift pty"); ERROR("Failed to shift pty");
goto on_error; goto on_error;
......
...@@ -1154,7 +1154,7 @@ void lxc_terminal_conf_free(struct lxc_pty *terminal) ...@@ -1154,7 +1154,7 @@ void lxc_terminal_conf_free(struct lxc_pty *terminal)
lxc_ringbuf_release(&terminal->ringbuf); lxc_ringbuf_release(&terminal->ringbuf);
} }
int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_pty *pty) int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_pty *pty)
{ {
int ret; int ret;
......
...@@ -237,6 +237,6 @@ extern int lxc_login_pty(int fd); ...@@ -237,6 +237,6 @@ extern int lxc_login_pty(int fd);
extern void lxc_terminal_conf_free(struct lxc_pty *console); extern void lxc_terminal_conf_free(struct lxc_pty *console);
extern void lxc_terminal_info_init(struct lxc_pty_info *pty); extern void lxc_terminal_info_init(struct lxc_pty_info *pty);
extern void lxc_terminal_init(struct lxc_pty *pty); extern void lxc_terminal_init(struct lxc_pty *pty);
extern int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_pty *pty); extern int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_pty *pty);
#endif #endif
...@@ -811,7 +811,7 @@ int lxc_init(const char *name, struct lxc_handler *handler) ...@@ -811,7 +811,7 @@ int lxc_init(const char *name, struct lxc_handler *handler)
} }
TRACE("Created console"); TRACE("Created console");
ret = lxc_pty_map_ids(conf, &conf->console); ret = lxc_terminal_map_ids(conf, &conf->console);
if (ret < 0) { if (ret < 0) {
ERROR("Failed to chown console"); ERROR("Failed to chown console");
goto out_restore_sigmask; goto out_restore_sigmask;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment