chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop sessions on ReleaseSession
[elogind.git]
/
src
/
login
/
logind-user-dbus.c
diff --git
a/src/login/logind-user-dbus.c
b/src/login/logind-user-dbus.c
index 03c33708fcc3e71a171166702af77a71a8b3658d..20ea2fbdc415882b28461ab7a70db53378b25921 100644
(file)
--- a/
src/login/logind-user-dbus.c
+++ b/
src/login/logind-user-dbus.c
@@
-103,11
+103,7
@@
static int property_get_sessions(
}
}
- r = sd_bus_message_close_container(reply);
- if (r < 0)
- return r;
-
- return 1;
+ return sd_bus_message_close_container(reply);
}
static int property_get_idle_hint(
}
static int property_get_idle_hint(
@@
-138,7
+134,7
@@
static int property_get_idle_since_hint(
sd_bus_error *error) {
User *u = userdata;
sd_bus_error *error) {
User *u = userdata;
- dual_timestamp t;
+ dual_timestamp t
= DUAL_TIMESTAMP_NULL
;
uint64_t k;
assert(bus);
uint64_t k;
assert(bus);
@@
-172,11
+168,10
@@
static int property_get_linger(
return sd_bus_message_append(reply, "b", r > 0);
}
return sd_bus_message_append(reply, "b", r > 0);
}
-int bus_user_method_terminate(sd_bus
*bus, sd_bus
_message *message, void *userdata, sd_bus_error *error) {
+int bus_user_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error) {
User *u = userdata;
int r;
User *u = userdata;
int r;
- assert(bus);
assert(message);
assert(u);
assert(message);
assert(u);
@@
-184,6
+179,7
@@
int bus_user_method_terminate(sd_bus *bus, sd_bus_message *message, void *userda
message,
CAP_KILL,
"org.freedesktop.login1.manage",
message,
CAP_KILL,
"org.freedesktop.login1.manage",
+ NULL,
false,
u->uid,
&u->manager->polkit_registry,
false,
u->uid,
&u->manager->polkit_registry,
@@
-200,12
+196,11
@@
int bus_user_method_terminate(sd_bus *bus, sd_bus_message *message, void *userda
return sd_bus_reply_method_return(message, NULL);
}
return sd_bus_reply_method_return(message, NULL);
}
-int bus_user_method_kill(sd_bus
*bus, sd_bus
_message *message, void *userdata, sd_bus_error *error) {
+int bus_user_method_kill(sd_bus_message *message, void *userdata, sd_bus_error *error) {
User *u = userdata;
int32_t signo;
int r;
User *u = userdata;
int32_t signo;
int r;
- assert(bus);
assert(message);
assert(u);
assert(message);
assert(u);
@@
-213,6
+208,7
@@
int bus_user_method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, s
message,
CAP_KILL,
"org.freedesktop.login1.manage",
message,
CAP_KILL,
"org.freedesktop.login1.manage",
+ NULL,
false,
u->uid,
&u->manager->polkit_registry,
false,
u->uid,
&u->manager->polkit_registry,