chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: fix up wording in the comment
[elogind.git]
/
src
/
core
/
dbus-snapshot.c
diff --git
a/src/core/dbus-snapshot.c
b/src/core/dbus-snapshot.c
index 06a58e429ec4ae11398f7131453af121308bd569..0be46c288efe80b3602d66fcf53d369dcbe220c2 100644
(file)
--- a/
src/core/dbus-snapshot.c
+++ b/
src/core/dbus-snapshot.c
@@
-21,8
+21,8
@@
#include "selinux-access.h"
#include "unit.h"
#include "selinux-access.h"
#include "unit.h"
+#include "dbus.h"
#include "snapshot.h"
#include "snapshot.h"
-#include "dbus-unit.h"
#include "dbus-snapshot.h"
int bus_snapshot_method_remove(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
#include "dbus-snapshot.h"
int bus_snapshot_method_remove(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@
-37,6
+37,12
@@
int bus_snapshot_method_remove(sd_bus *bus, sd_bus_message *message, void *userd
if (r < 0)
return r;
if (r < 0)
return r;
+ r = bus_verify_manage_units_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 */
+
snapshot_remove(s);
return sd_bus_reply_method_return(message, NULL);
snapshot_remove(s);
return sd_bus_reply_method_return(message, NULL);
@@
-44,7
+50,7
@@
int bus_snapshot_method_remove(sd_bus *bus, sd_bus_message *message, void *userd
const sd_bus_vtable bus_snapshot_vtable[] = {
SD_BUS_VTABLE_START(0),
const sd_bus_vtable bus_snapshot_vtable[] = {
SD_BUS_VTABLE_START(0),
- SD_BUS_METHOD("Remove", NULL, NULL, bus_snapshot_method_remove, 0),
SD_BUS_PROPERTY("Cleanup", "b", bus_property_get_bool, offsetof(Snapshot, cleanup), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("Cleanup", "b", bus_property_get_bool, offsetof(Snapshot, cleanup), SD_BUS_VTABLE_PROPERTY_CONST),
+ SD_BUS_METHOD("Remove", NULL, NULL, bus_snapshot_method_remove, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_VTABLE_END
};
SD_BUS_VTABLE_END
};