proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-02 18:56:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix lxc-attach returned error

Browse Source 
When we try to attach to a container belonging to another user than us,
the command fails as expected but the return code is wrong, so we have
an "unknown error" instead of "permission denied".

The culprit is:

-                     strerror(command.answer.ret));
+                     strerror(-command.answer.ret));

The rest of the code is indentation without code impact.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Michel Normand <normand@fr.ibm.com>
This commit is contained in:
Daniel Lezcano 2010-03-22 11:08:34 +01:00 committed by Daniel Lezcano
parent 81c75799cc
commit 0a3ec35014
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lxc/commands.c
View File

@ -149,7 +149,7 @@ static int command_handler(int fd, void *data, struct lxc_epoll_descr *descr)
struct lxc_handler *handler = data;
ret = lxc_af_unix_rcv_credential(fd, &request, sizeof(request));
if (ret < 0 && ret == -EACCES) {
if (ret == -EACCES) {
/* we don't care for the peer, just send and close */
struct lxc_answer answer = { .ret = ret };
send(fd, &answer, sizeof(answer), 0);
@ -196,7 +196,8 @@ static int incoming_command_handler(int fd, void *data,
return -1;
}
if (setsockopt(connection, SOL_SOCKET, SO_PASSCRED, &opt, sizeof(opt))) {
if (setsockopt(connection, SOL_SOCKET,
SO_PASSCRED, &opt, sizeof(opt))) {
SYSERROR("failed to enable credential on socket");
goto out_close;
}
@ -215,7 +216,8 @@ out_close:
goto out;
}
extern int lxc_command_mainloop_add(const char *name, struct lxc_epoll_descr *descr,
extern int lxc_command_mainloop_add(const char *name,
struct lxc_epoll_descr *descr,
struct lxc_handler *handler)
{
int ret, fd;
@ -230,7 +232,8 @@ extern int lxc_command_mainloop_add(const char *name, struct lxc_epoll_descr *de
return -1;
}
ret = lxc_mainloop_add_handler(descr, fd, incoming_command_handler, handler);
ret = lxc_mainloop_add_handler(descr, fd, incoming_command_handler,
handler);
if (ret) {
ERROR("failed to add handler for command socket");
close(fd);

2
src/lxc/lxc_attach.c
View File

@ -71,7 +71,7 @@ pid_t get_init_pid(const char *name)
if (command.answer.ret) {
ERROR("failed to retrieve the init pid: %s",
strerror(command.answer.ret));
strerror(-command.answer.ret));
return -1;
}

3
src/lxc/start.c
View File

@ -204,7 +204,8 @@ static int sigchld_handler(int fd, void *data,
return 1;
}
int lxc_pid_callback(int fd, struct lxc_request *request, struct lxc_handler *handler)
int lxc_pid_callback(int fd, struct lxc_request *request,
struct lxc_handler *handler)
{
struct lxc_answer answer;
int ret;