summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-02-01 19:04:54 +0100
committerLennart Poettering <lennart@poettering.net>2012-02-01 19:04:54 +0100
commitc4aa65e7147dc742886edf25593e10466b02fc3a (patch)
treed6e4698cebcaf4f23fb3013f7cb03851fe41e3d2
parentede3deb4256742c6dfb3be515436209c1b088ac6 (diff)
logind: add GetSessionByPID() bus call
-rw-r--r--TODO2
-rw-r--r--src/login/logind-dbus.c38
-rw-r--r--src/login/org.freedesktop.login1.conf4
3 files changed, 43 insertions, 1 deletions
diff --git a/TODO b/TODO
index a30621e757..baf4840cdb 100644
--- a/TODO
+++ b/TODO
@@ -23,7 +23,7 @@ Features:
* journald: reuse XZ context
-* logind: add equivalent to sd_pid_get_session() to the D-Bus API
+* logind: add equivalent to sd_pid_get_owner_uid() to the D-Bus API
* Fedora: disable journald's /proc/kmsg reading on Fedora for now
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index da2eb141c7..fda1b0dba3 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -36,6 +36,10 @@
" <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \
" <arg name=\"session\" type=\"o\" direction=\"out\"/>\n" \
" </method>\n" \
+ " <method name=\"GetSessionByPID\">\n" \
+ " <arg name=\"pid\" type=\"u\" direction=\"in\"/>\n" \
+ " <arg name=\"session\" type=\"o\" direction=\"out\"/>\n" \
+ " </method>\n" \
" <method name=\"GetUser\">\n" \
" <arg name=\"uid\" type=\"u\" direction=\"in\"/>\n" \
" <arg name=\"user\" type=\"o\" direction=\"out\"/>\n" \
@@ -771,6 +775,40 @@ static DBusHandlerResult manager_message_handler(
if (!b)
goto oom;
+ } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "GetSessionByPID")) {
+ uint32_t pid;
+ char *p;
+ Session *session;
+ bool b;
+
+ if (!dbus_message_get_args(
+ message,
+ &error,
+ DBUS_TYPE_UINT32, &pid,
+ DBUS_TYPE_INVALID))
+ return bus_send_error_reply(connection, message, &error, -EINVAL);
+
+ r = manager_get_session_by_pid(m, pid, &session);
+ if (r <= 0)
+ return bus_send_error_reply(connection, message, NULL, r < 0 ? r : -ENOENT);
+
+ reply = dbus_message_new_method_return(message);
+ if (!reply)
+ goto oom;
+
+ p = session_bus_path(session);
+ if (!p)
+ goto oom;
+
+ b = dbus_message_append_args(
+ reply,
+ DBUS_TYPE_OBJECT_PATH, &p,
+ DBUS_TYPE_INVALID);
+ free(p);
+
+ if (!b)
+ goto oom;
+
} else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "GetUser")) {
uint32_t uid;
char *p;
diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf
index c423ef5930..17ec605cde 100644
--- a/src/login/org.freedesktop.login1.conf
+++ b/src/login/org.freedesktop.login1.conf
@@ -42,6 +42,10 @@
<allow send_destination="org.freedesktop.login1"
send_interface="org.freedesktop.login1.Manager"
+ send_member="GetSessionByPID"/>
+
+ <allow send_destination="org.freedesktop.login1"
+ send_interface="org.freedesktop.login1.Manager"
send_member="GetUser"/>
<allow send_destination="org.freedesktop.login1"