summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-02-13 23:48:47 +0100
committerLennart Poettering <lennart@poettering.net>2012-02-13 23:50:03 +0100
commit72e764a6911936343aa56f3697bb3817224cdaba (patch)
treecbff197dee0dd41a59a7859e1493e2d3aa242779
parent50b1678aaba9d3c2be5115db34a822911d791b8c (diff)
dbus: update bus addresses to "unixexec:" protocol specifier
The new protocol specified that we are settling on is "unixexec:" rather than just "exec:", hence let's update our code accordingly. https://bugs.freedesktop.org/show_bug.cgi?id=35230
-rw-r--r--src/dbus-common.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/dbus-common.c b/src/dbus-common.c
index a072369988..2905ac3c83 100644
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -177,11 +177,11 @@ int bus_connect_system_ssh(const char *user, const char *host, DBusConnection **
assert(user || host);
if (user && host)
- asprintf(&p, "exec:path=ssh,argv1=-xT,argv2=%s@%s,argv3=systemd-stdio-bridge", user, host);
+ asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s@%s,argv3=systemd-stdio-bridge", user, host);
else if (user)
- asprintf(&p, "exec:path=ssh,argv1=-xT,argv2=%s@localhost,argv3=systemd-stdio-bridge", user);
+ asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s@localhost,argv3=systemd-stdio-bridge", user);
else if (host)
- asprintf(&p, "exec:path=ssh,argv1=-xT,argv2=%s,argv3=systemd-stdio-bridge", host);
+ asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s,argv3=systemd-stdio-bridge", host);
if (!p) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, NULL);
@@ -222,7 +222,8 @@ int bus_connect_system_polkit(DBusConnection **_bus, DBusError *error) {
if (geteuid() == 0)
return bus_connect(DBUS_BUS_SYSTEM, _bus, NULL, error);
- if (!(bus = dbus_connection_open_private("exec:path=pkexec,argv1=" SYSTEMD_STDIO_BRIDGE_BINARY_PATH, error)))
+ bus = dbus_connection_open_private("unixexec:path=pkexec,argv1=" SYSTEMD_STDIO_BRIDGE_BINARY_PATH, error);
+ if (!bus)
return -EIO;
dbus_connection_set_exit_on_disconnect(bus, FALSE);