X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-timer.c;h=11d18cbd8342c5fa38ae8e8691c97840b17edf11;hb=f274ece0f76b5709408821e317e87aef76123db6;hp=c76c2e0500bff23b49f04eb3530d3e273004f516;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git

diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index c76c2e050..11d18cbd8 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -25,6 +25,7 @@
 #include "dbus-timer.h"
 #include "dbus-execute.h"
 #include "dbus-common.h"
+#include "selinux-access.h"
 
 #define BUS_TIMER_INTERFACE                                             \
         " <interface name=\"org.freedesktop.systemd1.Timer\">\n"        \
@@ -78,7 +79,8 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi
 
                 /* s/Sec/USec/ */
                 l = strlen(t);
-                if (!(buf = new(char, l+2)))
+                buf = new(char, l+2);
+                if (!buf)
                         return -ENOMEM;
 
                 memcpy(buf, t, l-3);
@@ -120,7 +122,8 @@ static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_timer_append_timer_result, timer_resu
 static const BusProperty bus_timer_properties[] = {
         { "Unit",           bus_timer_append_unit,        "s", 0 },
         { "Timers",         bus_timer_append_timers, "a(stt)", 0 },
-        { "NextElapseUSec", bus_property_append_usec,     "t", offsetof(Timer, next_elapse) },
+        { "NextElapseUSec", bus_property_append_usec,     "t", offsetof(Timer, next_elapse_monotonic) },
+        { "NextElapseUSecRealtime", bus_property_append_usec, "t", offsetof(Timer, next_elapse_realtime) },
         { "Result",         bus_timer_append_timer_result,"s", offsetof(Timer, result)      },
         { NULL, }
 };
@@ -133,5 +136,7 @@ DBusHandlerResult bus_timer_message_handler(Unit *u, DBusConnection *c, DBusMess
                 { NULL, }
         };
 
+        SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status");
+
         return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
 }