clients: unify how we invoke getopt_long()

[elogind.git] / src / core / dbus-snapshot.c

diff --git a/src/core/dbus-snapshot.c b/src/core/dbus-snapshot.c
index 7ff0bca2c86cd8608a14ff702a724b0fd69d486c..9978df60225fee863f259bbf2ddefb20a35497e9 100644 (file)
--- a/src/core/dbus-snapshot.c
+++ b/src/core/dbus-snapshot.c
@@ -22,6 +22,7 @@
 #include "dbus-unit.h"
 #include "dbus-snapshot.h"
 #include "dbus-common.h"
+#include "selinux-access.h"
 
 #define BUS_SNAPSHOT_INTERFACE                                          \
         " <interface name=\"org.freedesktop.systemd1.Snapshot\">\n"     \
@@ -43,7 +44,7 @@
         BUS_UNIT_INTERFACES_LIST                     \
         "org.freedesktop.systemd1.Snapshot\0"
 
-const char bus_snapshot_interface[] _introspect_("Snapshot") = BUS_SNAPSHOT_INTERFACE;
+const char bus_snapshot_interface[] = BUS_SNAPSHOT_INTERFACE;
 
 static const BusProperty bus_snapshot_properties[] = {
         { "Cleanup", bus_property_append_bool, "b", offsetof(Snapshot, cleanup) },
@@ -52,42 +53,32 @@ static const BusProperty bus_snapshot_properties[] = {
 
 DBusHandlerResult bus_snapshot_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
         Snapshot *s = SNAPSHOT(u);
+        _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
 
-        DBusMessage *reply = NULL;
-        DBusError error;
+        if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Snapshot", "Remove")) {
 
-        dbus_error_init(&error);
+                SELINUX_UNIT_ACCESS_CHECK(u, c, message, "stop");
 
-        if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Snapshot", "Remove")) {
+                reply = dbus_message_new_method_return(message);
+                if (!reply)
+                        return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
                 snapshot_remove(SNAPSHOT(u));
 
-                if (!(reply = dbus_message_new_method_return(message)))
-                        goto oom;
-
         } else {
                 const BusBoundProperties bps[] = {
                         { "org.freedesktop.systemd1.Unit",     bus_unit_properties,     u },
                         { "org.freedesktop.systemd1.Snapshot", bus_snapshot_properties, s },
                         { NULL, }
                 };
-                return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
-        }
 
-        if (reply) {
-                if (!dbus_connection_send(c, reply, NULL))
-                        goto oom;
+                SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status");
 
-                dbus_message_unref(reply);
+                return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
         }
 
-        return DBUS_HANDLER_RESULT_HANDLED;
-
-oom:
-        if (reply)
-                dbus_message_unref(reply);
+        if (!bus_maybe_send_reply(c, message, reply))
+                return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
-        dbus_error_free(&error);
-
-        return DBUS_HANDLER_RESULT_NEED_MEMORY;
+        return DBUS_HANDLER_RESULT_HANDLED;
 }