X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogind-session-dbus.c;h=eca33e5e24788673e38df8cf9d97a9b1ad7f76f2;hp=b0e592d21560f3339d671604e797090d2eeef301;hb=1c7dde3e475978c569a982d65fd86d4b4e3caad8;hpb=77527da0a02029ce9c5ec86d5db5ea42147a658f
diff --git a/src/logind-session-dbus.c b/src/logind-session-dbus.c
index b0e592d21..eca33e5e2 100644
--- a/src/logind-session-dbus.c
+++ b/src/logind-session-dbus.c
@@ -36,7 +36,7 @@
" \n" \
" \n" \
" \n" \
- " \n" \
+ " \n" \
" \n" \
" \n" \
" \n" \
@@ -49,6 +49,7 @@
" \n" \
" \n" \
" \n" \
+ " \n" \
" \n" \
" \n" \
" \n" \
@@ -236,6 +237,7 @@ static DBusHandlerResult session_message_dispatch(
{ "org.freedesktop.login1.Session", "Remote", bus_property_append_bool, "b", &s->remote },
{ "org.freedesktop.login1.Session", "RemoteUser", bus_property_append_string, "s", s->remote_user },
{ "org.freedesktop.login1.Session", "RemoteHost", bus_property_append_string, "s", s->remote_host },
+ { "org.freedesktop.login1.Session", "Service", bus_property_append_string, "s", s->service },
{ "org.freedesktop.login1.Session", "Leader", bus_property_append_pid, "u", &s->leader },
{ "org.freedesktop.login1.Session", "Audit", bus_property_append_uint32, "u", &s->audit_id },
{ "org.freedesktop.login1.Session", "Type", bus_session_append_type, "s", &s->type },
@@ -300,6 +302,7 @@ static DBusHandlerResult session_message_dispatch(
} else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Session", "SetIdleHint")) {
dbus_bool_t b;
+ unsigned long ul;
if (!dbus_message_get_args(
message,
@@ -308,6 +311,13 @@ static DBusHandlerResult session_message_dispatch(
DBUS_TYPE_INVALID))
return bus_send_error_reply(connection, message, &error, -EINVAL);
+ ul = dbus_bus_get_unix_user(connection, dbus_message_get_sender(message), &error);
+ if (ul == (unsigned long) -1)
+ return bus_send_error_reply(connection, message, &error, -EIO);
+
+ if (ul != 0 && ul != s->user->uid)
+ return bus_send_error_reply(connection, message, NULL, -EPERM);
+
session_set_idle_hint(s, b);
reply = dbus_message_new_method_return(message);
@@ -427,6 +437,9 @@ int session_send_changed(Session *s, const char *properties) {
assert(s);
+ if (!s->started)
+ return 0;
+
p = session_bus_path(s);
if (!p)
return -ENOMEM;