picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logind: add GetSessionByPID() bus call

This commit is contained in:
Lennart Poettering 2012-02-01 19:04:54 +01:00
parent ede3deb425
commit c4aa65e714
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -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

38
src/login/logind-dbus.c
View File

@ -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;

4
src/login/org.freedesktop.login1.conf
View File

@ -40,6 +40,10 @@
send_interface="org.freedesktop.login1.Manager"
send_member="GetSession"/>
<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"/>