summaryrefslogtreecommitdiff
path: root/src/machine
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-12-17 01:03:09 +0100
committerLennart Poettering <lennart@poettering.net>2013-12-17 01:05:37 +0100
commita4475f577bd0daf762d6c3b4e58bc484e0cb74af (patch)
tree5dca2abf91be82c72179b9f0ba745d32d4fdc85f /src/machine
parentd003f514dab2dbf1a66e11800a50aeaf039d036c (diff)
bus: when entering an existing namespace to connect to a container's system bus also switch over PID namespace
This is necessary to ensure that kdbus can collect creds of the destination namespace when connecting.
Diffstat (limited to 'src/machine')
-rw-r--r--src/machine/machinectl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index f5485b3d42..fd21a0a815 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -399,7 +399,7 @@ static int terminate_machine(sd_bus *bus, char **args, unsigned n) {
static int openpt_in_namespace(pid_t pid, int flags) {
_cleanup_close_pipe_ int pair[2] = { -1, -1 };
- _cleanup_close_ int nsfd = -1, rootfd = -1;
+ _cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
union {
struct cmsghdr cmsghdr;
uint8_t buf[CMSG_SPACE(sizeof(int))];
@@ -413,7 +413,7 @@ static int openpt_in_namespace(pid_t pid, int flags) {
pid_t child;
siginfo_t si;
- r = namespace_open(pid, &nsfd, &rootfd);
+ r = namespace_open(pid, &pidnsfd, &mntnsfd, &rootfd);
if (r < 0)
return r;
@@ -428,7 +428,7 @@ static int openpt_in_namespace(pid_t pid, int flags) {
close_nointr_nofail(pair[0]);
pair[0] = -1;
- r = namespace_enter(nsfd, rootfd);
+ r = namespace_enter(pidnsfd, mntnsfd, rootfd);
if (r < 0)
_exit(EXIT_FAILURE);