X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimedate%2Ftimedated.c;h=0d4a9dd7e21230a02df7b9e3ba303cf0432fa4b5;hp=f0371759a21e7ae54375c3834b9e4448d9bbb25a;hb=eef8df097db0bf29c8e42e532e3bc06775a6cad4;hpb=def9a7aa0182e5ecca3ac61b26f75136a5c4f103 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index f0371759a..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,17 +31,22 @@ #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-errors.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", EOPNOTSUPP), + SD_BUS_ERROR_MAP_END +}; + typedef struct Context { char *zone; bool local_rtc; @@ -52,11 +55,11 @@ typedef struct Context { Hashmap *polkit_registry; } Context; -static void context_free(Context *c, sd_bus *bus) { +static void context_free(Context *c) { assert(c); free(c->zone); - bus_verify_polkit_async_registry_free(bus, c->polkit_registry); + bus_verify_polkit_async_registry_free(c->polkit_registry); } static int context_read_data(Context *c) { @@ -70,7 +73,7 @@ static int context_read_data(Context *c) { if (r == -EINVAL) log_warning("/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/."); else - log_warning("Failed to get target of /etc/localtime: %s", strerror(-r)); + log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); } else { const char *e; @@ -176,7 +179,7 @@ static int context_write_data_local_rtc(Context *c) { } } - label_init("/etc"); + mac_selinux_init("/etc"); return write_string_file_atomic_label("/etc/adjtime", w); } @@ -219,45 +222,28 @@ 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") || - sd_bus_error_has_name(error, "org.freedesktop.systemd1.NoSuchUnit")) { - sd_bus_error_set_const(error, "org.freedesktop.timedate1.NoNTPSupport", "NTP not supported."); - return -ENOTSUP; - } + sd_bus_error_has_name(error, "org.freedesktop.systemd1.NoSuchUnit")) + return sd_bus_error_set_const(error, "org.freedesktop.timedate1.NoNTPSupport", "NTP not supported."); return r; } @@ -265,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", @@ -298,10 +283,8 @@ static int context_enable_ntp(Context*c, sd_bus *bus, sd_bus_error *error) { false); if (r < 0) { - if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND)) { - sd_bus_error_set_const(error, "org.freedesktop.timedate1.NoNTPSupport", "NTP not supported."); - return -ENOTSUP; - } + if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND)) + return sd_bus_error_set_const(error, "org.freedesktop.timedate1.NoNTPSupport", "NTP not supported."); return r; } @@ -395,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(bus, &c->polkit_registry, m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-timezone", interactive, error, method_set_timezone, c); + 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) @@ -411,7 +401,7 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, s /* 1. Write new configuration file */ r = context_write_data_timezone(c); if (r < 0) { - log_error("Failed to set time zone: %s", strerror(-r)); + log_error_errno(r, "Failed to set time zone: %m"); return sd_bus_error_set_errnof(error, r, "Failed to set time zone: %s", strerror(-r)); } @@ -429,9 +419,9 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, s } log_struct(LOG_INFO, - MESSAGE_ID(SD_MESSAGE_TIMEZONE_CHANGE), + LOG_MESSAGE_ID(SD_MESSAGE_TIMEZONE_CHANGE), "TIMEZONE=%s", c->zone, - "MESSAGE=Changed time zone to '%s'.", c->zone, + LOG_MESSAGE("Changed time zone to '%s'.", c->zone), NULL); sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "Timezone", NULL); @@ -456,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(bus, &c->polkit_registry, m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-local-rtc", interactive, error, method_set_local_rtc, c); + 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) @@ -467,7 +464,7 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata, /* 1. Write new configuration file */ r = context_write_data_local_rtc(c); if (r < 0) { - log_error("Failed to set RTC to local/UTC: %s", strerror(-r)); + log_error_errno(r, "Failed to set RTC to local/UTC: %m"); return sd_bus_error_set_errnof(error, r, "Failed to set RTC to local/UTC: %s", strerror(-r)); } @@ -527,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; @@ -537,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; @@ -561,15 +562,30 @@ 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(bus, &c->polkit_registry, m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-time", interactive, error, method_set_time, c); + 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("Failed to set local time: %m"); + log_error_errno(errno, "Failed to set local time: %m"); return sd_bus_error_set_errnof(error, errno, "Failed to set local time: %m"); } @@ -581,43 +597,49 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu clock_set_hwclock(tm); log_struct(LOG_INFO, - MESSAGE_ID(SD_MESSAGE_TIME_CHANGE), + LOG_MESSAGE_ID(SD_MESSAGE_TIME_CHANGE), "REALTIME="USEC_FMT, timespec_load(&ts), - "MESSAGE=Changed local time to %s", ctime(&ts.tv_sec), + LOG_MESSAGE("Changed local time to %s", ctime(&ts.tv_sec)), NULL); return sd_bus_reply_method_return(m, NULL); } 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(bus, &c->polkit_registry, m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-ntp", interactive, error, method_set_ntp, c); + 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); @@ -649,28 +671,20 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) { assert(_bus); r = sd_bus_default_system(&bus); - if (r < 0) { - log_error("Failed to get system bus connection: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to get system bus connection: %m"); r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c); - if (r < 0) { - log_error("Failed to register object: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to register object: %m"); r = sd_bus_request_name(bus, "org.freedesktop.timedate1", 0); - if (r < 0) { - log_error("Failed to register name: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to register name: %m"); r = sd_bus_attach_event(bus, event, 0); - if (r < 0) { - log_error("Failed to attach bus to event loop: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to attach bus to event loop: %m"); *_bus = bus; bus = NULL; @@ -698,7 +712,7 @@ int main(int argc, char *argv[]) { r = sd_event_default(&event); if (r < 0) { - log_error("Failed to allocate event loop: %s", strerror(-r)); + log_error_errno(r, "Failed to allocate event loop: %m"); goto finish; } @@ -708,26 +722,28 @@ 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("Failed to read time zone data: %s", strerror(-r)); + log_error_errno(r, "Failed to read time zone data: %m"); goto finish; } r = context_read_ntp(&context, bus); if (r < 0) { - log_error("Failed to determine whether NTP is enabled: %s", strerror(-r)); + log_error_errno(r, "Failed to determine whether NTP is enabled: %m"); goto finish; } r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC, NULL, NULL); if (r < 0) { - log_error("Failed to run event loop: %s", strerror(-r)); + log_error_errno(r, "Failed to run event loop: %m"); goto finish; } finish: - context_free(&context, bus); + context_free(&context); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }