chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: Fix navigating backwards missing entries
[elogind.git]
/
src
/
core
/
dbus-scope.c
diff --git
a/src/core/dbus-scope.c
b/src/core/dbus-scope.c
index 73b7bbf18cb418bef57920f36f554807add29b11..a762223c81d73c4d145cdc974c5280d06ed293ac 100644
(file)
--- a/
src/core/dbus-scope.c
+++ b/
src/core/dbus-scope.c
@@
-25,6
+25,7
@@
#include "dbus-cgroup.h"
#include "dbus-kill.h"
#include "dbus-scope.h"
#include "dbus-cgroup.h"
#include "dbus-kill.h"
#include "dbus-scope.h"
+#include "dbus.h"
#include "bus-util.h"
#include "bus-internal.h"
#include "bus-errors.h"
#include "bus-util.h"
#include "bus-internal.h"
#include "bus-errors.h"
@@
-37,6
+38,12
@@
static int bus_scope_abandon(sd_bus *bus, sd_bus_message *message, void *userdat
assert(message);
assert(s);
assert(message);
assert(s);
+ r = bus_verify_manage_unit_async(UNIT(s)->manager, message, error);
+ if (r < 0)
+ return r;
+ if (r == 0)
+ return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */
+
r = scope_abandon(s);
if (sd_bus_error_is_set(error))
return r;
r = scope_abandon(s);
if (sd_bus_error_is_set(error))
return r;
@@
-138,7
+145,7
@@
static int bus_scope_set_transient_property(
if (r < 0)
return r;
if (r < 0)
return r;
- unit_write_drop_in_format(UNIT(s), mode, name, "[Scope]\nTimeoutStopSec=
%lluus\n", (unsigned long long)
s->timeout_stop_usec);
+ unit_write_drop_in_format(UNIT(s), mode, name, "[Scope]\nTimeoutStopSec=
"USEC_FMT"us\n",
s->timeout_stop_usec);
} else {
r = sd_bus_message_skip(message, "t");
if (r < 0)
} else {
r = sd_bus_message_skip(message, "t");
if (r < 0)
@@
-209,10
+216,10
@@
int bus_scope_send_request_stop(Scope *s) {
r = sd_bus_message_new_signal(
UNIT(s)->manager->api_bus,
r = sd_bus_message_new_signal(
UNIT(s)->manager->api_bus,
+ &m,
p,
"org.freedesktop.systemd1.Scope",
p,
"org.freedesktop.systemd1.Scope",
- "RequestStop",
- &m);
+ "RequestStop");
if (r < 0)
return r;
if (r < 0)
return r;