summaryrefslogtreecommitdiff
path: root/src/machine
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-01 20:12:25 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-01 20:40:24 +0200
commita07c35c3e65c16264cb25206c2d564afdbae8a28 (patch)
tree74542a753a9d2fd696446ee42a4d337d6767f6e4 /src/machine
parent395745ba533ac91fe118f43ec83f13a752c0b473 (diff)
machined: introduce a ptsname_namespace() call and make use of it
The call is like ptsname() but does not assume the pty path was accessible in the local namespace. It uses the same internal ioctl though.
Diffstat (limited to 'src/machine')
-rw-r--r--src/machine/machine-dbus.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index f27b58b893..a63b9785af 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -45,6 +45,7 @@
#include "formats-util.h"
#include "process-util.h"
#include "env-util.h"
+#include "terminal-util.h"
static int property_get_id(
sd_bus *bus,
@@ -500,7 +501,7 @@ int bus_machine_method_open_pty(sd_bus_message *message, void *userdata, sd_bus_
if (master < 0)
return master;
- r = ptsname_malloc(master, &pty_name);
+ r = ptsname_namespace(master, &pty_name);
if (r < 0)
return r;
@@ -589,7 +590,7 @@ int bus_machine_method_open_login(sd_bus_message *message, void *userdata, sd_bu
if (master < 0)
return master;
- r = ptsname_malloc(master, &pty_name);
+ r = ptsname_namespace(master, &pty_name);
if (r < 0)
return r;
@@ -687,7 +688,7 @@ int bus_machine_method_open_shell(sd_bus_message *message, void *userdata, sd_bu
if (master < 0)
return master;
- r = ptsname_malloc(master, &pty_name);
+ r = ptsname_namespace(master, &pty_name);
if (r < 0)
return r;