X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftimedate%2Ftimedated.c;h=0d4a9dd7e21230a02df7b9e3ba303cf0432fa4b5;hb=eef8df097db0bf29c8e42e532e3bc06775a6cad4;hp=bf567a162452076beec7b7a5e75ca9583b088ccd;hpb=96aad8d15a324d0e956a4e5653a11a67b209b41a;p=elogind.git diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index bf567a162..0d4a9dd7e 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -22,9 +22,7 @@ #include #include #include -#include -#include "sd-id128.h" #include "sd-messages.h" #include "sd-event.h" #include "sd-bus.h" @@ -33,20 +31,19 @@ #include "strv.h" #include "def.h" #include "clock-util.h" -#include "conf-files.h" #include "path-util.h" #include "fileio-label.h" -#include "label.h" #include "bus-util.h" #include "bus-error.h" #include "bus-common-errors.h" #include "event-util.h" +#include "selinux-util.h" #define NULL_ADJTIME_UTC "0.0 0 0\n0\nUTC\n" #define NULL_ADJTIME_LOCAL "0.0 0 0\n0\nLOCAL\n" static BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map timedated_errors[] = { - SD_BUS_ERROR_MAP("org.freedesktop.timedate1.NoNTPSupport", ENOTSUP), + SD_BUS_ERROR_MAP("org.freedesktop.timedate1.NoNTPSupport", EOPNOTSUPP), SD_BUS_ERROR_MAP_END }; @@ -225,38 +222,23 @@ static int context_read_ntp(Context *c, sd_bus *bus) { return 0; } -static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) { +static int context_start_ntp(sd_bus *bus, sd_bus_error *error, bool enabled) { int r; - assert(c); assert(bus); assert(error); - if (c->use_ntp) - r = sd_bus_call_method( - bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StartUnit", - error, - NULL, - "ss", - "systemd-timesyncd.service", - "replace"); - else - r = sd_bus_call_method( - bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StopUnit", - error, - NULL, - "ss", - "systemd-timesyncd.service", - "replace"); - + r = sd_bus_call_method( + bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + enabled ? "StartUnit" : "StopUnit", + error, + NULL, + "ss", + "systemd-timesyncd.service", + "replace"); if (r < 0) { if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND) || sd_bus_error_has_name(error, "org.freedesktop.systemd1.LoadFailed") || @@ -269,14 +251,13 @@ static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) { return 0; } -static int context_enable_ntp(Context*c, sd_bus *bus, sd_bus_error *error) { +static int context_enable_ntp(sd_bus *bus, sd_bus_error *error, bool enabled) { int r; - assert(c); assert(bus); assert(error); - if (c->use_ntp) + if (enabled) r = sd_bus_call_method( bus, "org.freedesktop.systemd1", @@ -397,7 +378,14 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, s if (streq_ptr(z, c->zone)) return sd_bus_reply_method_return(m, NULL); - r = bus_verify_polkit_async(m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-timezone", interactive, &c->polkit_registry, error); + r = bus_verify_polkit_async( + m, + CAP_SYS_TIME, + "org.freedesktop.timedate1.set-timezone", + interactive, + UID_INVALID, + &c->polkit_registry, + error); if (r < 0) return r; if (r == 0) @@ -458,7 +446,14 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata, if (lrtc == c->local_rtc) return sd_bus_reply_method_return(m, NULL); - r = bus_verify_polkit_async(m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-local-rtc", interactive, &c->polkit_registry, error); + r = bus_verify_polkit_async( + m, + CAP_SYS_TIME, + "org.freedesktop.timedate1.set-local-rtc", + interactive, + UID_INVALID, + &c->polkit_registry, + error); if (r < 0) return r; if (r == 0) @@ -529,6 +524,7 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu Context *c = userdata; int64_t utc; struct timespec ts; + usec_t start; struct tm* tm; int r; @@ -539,6 +535,9 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu if (c->use_ntp) return sd_bus_error_setf(error, BUS_ERROR_AUTOMATIC_TIME_SYNC_ENABLED, "Automatic time synchronization is enabled"); + /* this only gets used if dbus does not provide a timestamp */ + start = now(CLOCK_MONOTONIC); + r = sd_bus_message_read(m, "xbb", &utc, &relative, &interactive); if (r < 0) return r; @@ -563,12 +562,27 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu } else timespec_store(&ts, (usec_t) utc); - r = bus_verify_polkit_async(m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-time", interactive, &c->polkit_registry, error); + r = bus_verify_polkit_async( + m, + CAP_SYS_TIME, + "org.freedesktop.timedate1.set-time", + interactive, + UID_INVALID, + &c->polkit_registry, + error); if (r < 0) return r; if (r == 0) return 1; + /* adjust ts for time spent in program */ + r = sd_bus_message_get_monotonic_usec(m, &start); + /* when sd_bus_message_get_monotonic_usec() returns -ENODATA it does not modify &start */ + if (r < 0 && r != -ENODATA) + return r; + + timespec_store(&ts, timespec_load(&ts) + (now(CLOCK_MONOTONIC) - start)); + /* Set system clock */ if (clock_settime(CLOCK_REALTIME, &ts) < 0) { log_error_errno(errno, "Failed to set local time: %m"); @@ -592,34 +606,40 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu } static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *error) { - int ntp, interactive; + int enabled, interactive; Context *c = userdata; int r; - r = sd_bus_message_read(m, "bb", &ntp, &interactive); + r = sd_bus_message_read(m, "bb", &enabled, &interactive); if (r < 0) return r; - if ((bool)ntp == c->use_ntp) + if ((bool)enabled == c->use_ntp) return sd_bus_reply_method_return(m, NULL); - r = bus_verify_polkit_async(m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-ntp", interactive, &c->polkit_registry, error); + r = bus_verify_polkit_async( + m, + CAP_SYS_TIME, + "org.freedesktop.timedate1.set-ntp", + interactive, + UID_INVALID, + &c->polkit_registry, + error); if (r < 0) return r; if (r == 0) return 1; - c->use_ntp = ntp; - - r = context_enable_ntp(c, bus, error); + r = context_enable_ntp(bus, error, enabled); if (r < 0) return r; - r = context_start_ntp(c, bus, error); + r = context_start_ntp(bus, error, enabled); if (r < 0) return r; - log_info("Set NTP to %s", c->use_ntp ? "enabled" : "disabled"); + c->use_ntp = enabled; + log_info("Set NTP to %s", enabled ? "enabled" : "disabled"); sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "NTP", NULL); @@ -702,6 +722,8 @@ int main(int argc, char *argv[]) { if (r < 0) goto finish; + (void) sd_bus_negotiate_timestamp(bus, true); + r = context_read_data(&context); if (r < 0) { log_error_errno(r, "Failed to read time zone data: %m");