chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
condition: record test state internally and beef it up to be a full enum
[elogind.git]
/
src
/
core
/
dbus-scope.c
diff --git
a/src/core/dbus-scope.c
b/src/core/dbus-scope.c
index fbb4ff5646cdc31174836d140d1f1f29cea8f57e..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;