X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimedate%2Ftimedated.c;h=16036953fa3e4cff0f8c39a26209f92847e848ab;hp=3895e321c2895b18571d6df1d63efd58346a87eb;hb=b5af2aca120f1bf13cffc270803c2232918dd967;hpb=07a062a79374406e8f6b5a1e2f80c80baf031567 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 3895e321c..16036953f 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "sd-id128.h" #include "sd-messages.h" @@ -31,12 +32,13 @@ #include "util.h" #include "strv.h" #include "def.h" -#include "hwclock.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 "event-util.h" #define NULL_ADJTIME_UTC "0.0 0 0\n0\nUTC\n" @@ -45,74 +47,16 @@ typedef struct Context { char *zone; bool local_rtc; - unsigned can_ntp; - unsigned use_ntp; + bool can_ntp; + bool use_ntp; Hashmap *polkit_registry; } Context; -static void context_reset(Context *c) { +static void context_free(Context *c) { assert(c); free(c->zone); - c->zone = NULL; - - c->local_rtc = false; - c->can_ntp = c->use_ntp = -1; -} - -static void context_free(Context *c, sd_bus *bus) { - assert(c); - - context_reset(c); - bus_verify_polkit_async_registry_free(bus, c->polkit_registry); -} - -static bool valid_timezone(const char *name) { - const char *p; - char *t; - bool slash = false; - int r; - struct stat st; - - assert(name); - - if (*name == '/' || *name == 0) - return false; - - for (p = name; *p; p++) { - if (!(*p >= '0' && *p <= '9') && - !(*p >= 'a' && *p <= 'z') && - !(*p >= 'A' && *p <= 'Z') && - !(*p == '-' || *p == '_' || *p == '+' || *p == '/')) - return false; - - if (*p == '/') { - - if (slash) - return false; - - slash = true; - } else - slash = false; - } - - if (slash) - return false; - - t = strappend("/usr/share/zoneinfo/", name); - if (!t) - return false; - - r = stat(t, &st); - free(t); - - if (r < 0) - return false; - - if (!S_ISREG(st.st_mode)) - return false; - - return true; + bus_verify_polkit_async_registry_free(c->polkit_registry); } static int context_read_data(Context *c) { @@ -121,8 +65,6 @@ static int context_read_data(Context *c) { assert(c); - context_reset(c); - r = readlink_malloc("/etc/localtime", &t); if (r < 0) { if (r == -EINVAL) @@ -153,7 +95,7 @@ have_timezone: c->zone = NULL; } - c->local_rtc = hwclock_is_localtime() > 0; + c->local_rtc = clock_is_localtime() > 0; return 0; } @@ -238,217 +180,145 @@ static int context_write_data_local_rtc(Context *c) { return write_string_file_atomic_label("/etc/adjtime", w); } -static char** get_ntp_services(void) { - _cleanup_strv_free_ char **r = NULL, **files = NULL; - char **i; - int k; - - k = conf_files_list(&files, ".list", NULL, - "/etc/systemd/ntp-units.d", - "/run/systemd/ntp-units.d", - "/usr/local/lib/systemd/ntp-units.d", - "/usr/lib/systemd/ntp-units.d", - NULL); - if (k < 0) - return NULL; - - STRV_FOREACH(i, files) { - _cleanup_fclose_ FILE *f; - - f = fopen(*i, "re"); - if (!f) - continue; - - for (;;) { - char line[PATH_MAX], *l; - - if (!fgets(line, sizeof(line), f)) { - if (ferror(f)) - log_error("Failed to read NTP unit file: %m"); - - break; - } - - l = strstrip(line); - if (l[0] == 0 || l[0] == '#') - continue; - - if (strv_extend(&r, l) < 0) { - log_oom(); - return NULL; - } - } - } - - i = r; - r = NULL; /* avoid cleanup */ - - return strv_uniq(i); -} - static int context_read_ntp(Context *c, sd_bus *bus) { - _cleanup_strv_free_ char **l; - char **i; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + sd_bus_message *reply = NULL; + const char *s; int r; assert(c); assert(bus); - l = get_ntp_services(); - STRV_FOREACH(i, l) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - sd_bus_message *reply = NULL; - const char *s; - - r = sd_bus_call_method( - bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "GetUnitFileState", - &error, - &reply, - "s", - *i); + r = sd_bus_call_method( + bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "GetUnitFileState", + &error, + &reply, + "s", + "systemd-timesyncd.service"); - if (r < 0) { - /* This implementation does not exist. Try the next one. */ - if (sd_bus_error_has_name(&error, SD_BUS_ERROR_FILE_NOT_FOUND)) - continue; - - return r; - } - - r = sd_bus_message_read(reply, "s", &s); - if (r < 0) - return r; - - c->can_ntp = 1; - c->use_ntp = - streq(s, "enabled") || - streq(s, "enabled-runtime"); + 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")) + return 0; - return 0; + return r; } - /* NTP is not installed. */ - c->can_ntp = 0; - c->use_ntp = 0; + r = sd_bus_message_read(reply, "s", &s); + if (r < 0) + return r; + + c->can_ntp = true; + c->use_ntp = STR_IN_SET(s, "enabled", "enabled-runtime"); return 0; } static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) { - _cleanup_strv_free_ char **l = NULL; - char **i; int r; assert(c); assert(bus); assert(error); - l = get_ntp_services(); - STRV_FOREACH(i, l) { - - if (c->use_ntp) - r = sd_bus_call_method( - bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StartUnit", - error, - NULL, - "ss", *i, "replace"); - else - r = sd_bus_call_method( - bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StopUnit", - error, - NULL, - "ss", *i, "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")) { - /* This implementation does not exist. Try the next one. */ - sd_bus_error_free(error); - continue; - } + 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"); - return r; + 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; } - return 1; + return r; } - sd_bus_error_set_const(error, "org.freedesktop.timedate1.NoNTPSupport", "NTP not supported."); - return -ENOTSUP; + return 0; } static int context_enable_ntp(Context*c, sd_bus *bus, sd_bus_error *error) { - _cleanup_strv_free_ char **l = NULL; - char **i; int r; assert(c); assert(bus); assert(error); - l = get_ntp_services(); - STRV_FOREACH(i, l) { - if (c->use_ntp) - r = sd_bus_call_method( - bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "EnableUnitFiles", - error, - NULL, - "asbb", 1, *i, false, true); - else - r = sd_bus_call_method( - bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "DisableUnitFiles", - error, - NULL, - "asb", 1, *i, false); - - if (r < 0) { - if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND)) { - /* This implementation does not exist. Try the next one. */ - sd_bus_error_free(error); - continue; - } - - return r; - } - + if (c->use_ntp) r = sd_bus_call_method( bus, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", - "Reload", + "EnableUnitFiles", error, NULL, - NULL); - if (r < 0) - return r; + "asbb", 1, + "systemd-timesyncd.service", + false, true); + else + r = sd_bus_call_method( + bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "DisableUnitFiles", + error, + NULL, + "asb", 1, + "systemd-timesyncd.service", + false); - return 1; + 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; + } + + return r; } - sd_bus_error_set_const(error, "org.freedesktop.timedate1.NoNTPSupport", "NTP not supported."); - return -ENOTSUP; + r = sd_bus_call_method( + bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "Reload", + error, + NULL, + NULL); + if (r < 0) + return r; + + return 0; } static int property_get_rtc_time( @@ -465,7 +335,7 @@ static int property_get_rtc_time( int r; zero(tm); - r = hwclock_get_time(&tm); + r = clock_get_hwclock(&tm); if (r == -EBUSY) { log_warning("/dev/rtc is busy. Is somebody keeping it open continuously? That's not a good idea... Returning a bogus RTC timestamp."); t = 0; @@ -519,13 +389,13 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, s if (r < 0) return r; - if (!valid_timezone(z)) + if (!timezone_is_valid(z)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid time zone '%s'", z); if (streq_ptr(z, c->zone)) return sd_bus_reply_method_return(m, NULL); - r = bus_verify_polkit_async(bus, &c->polkit_registry, m, "org.freedesktop.timedate1.set-timezone", interactive, error, method_set_timezone, c); + r = bus_verify_polkit_async(bus, &c->polkit_registry, m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-timezone", interactive, error, method_set_timezone, c); if (r < 0) return r; if (r == 0) @@ -546,7 +416,7 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, s } /* 2. Tell the kernel our timezone */ - hwclock_set_timezone(NULL); + clock_set_timezone(NULL); if (c->local_rtc) { struct timespec ts; @@ -555,7 +425,7 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata, s /* 3. Sync RTC from system clock, with the new delta */ assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0); assert_se(tm = localtime(&ts.tv_sec)); - hwclock_set_time(tm); + clock_set_hwclock(tm); } log_struct(LOG_INFO, @@ -586,7 +456,7 @@ 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, "org.freedesktop.timedate1.set-local-rtc", interactive, error, method_set_local_rtc, c); + 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); if (r < 0) return r; if (r == 0) @@ -602,7 +472,7 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata, } /* 2. Tell the kernel our timezone */ - hwclock_set_timezone(NULL); + clock_set_timezone(NULL); /* 3. Synchronize clocks */ assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0); @@ -621,7 +491,7 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata, /* Override the main fields of * struct tm, but not the timezone * fields */ - if (hwclock_get_time(&tm) >= 0) { + if (clock_get_hwclock(&tm) >= 0) { /* And set the system clock * with this */ @@ -642,7 +512,7 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata, else tm = gmtime(&ts.tv_sec); - hwclock_set_time(tm); + clock_set_hwclock(tm); } log_info("RTC configured to %s time.", c->local_rtc ? "local" : "UTC"); @@ -664,6 +534,9 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu assert(m); assert(c); + if (c->use_ntp) + return sd_bus_error_setf(error, BUS_ERROR_AUTOMATIC_TIME_SYNC_ENABLED, "Automatic time synchronization is enabled"); + r = sd_bus_message_read(m, "xbb", &utc, &relative, &interactive); if (r < 0) return r; @@ -688,7 +561,7 @@ 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, "org.freedesktop.timedate1.set-time", interactive, error, method_set_time, c); + r = bus_verify_polkit_async(bus, &c->polkit_registry, m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-time", interactive, error, method_set_time, c); if (r < 0) return r; if (r == 0) @@ -705,12 +578,11 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu tm = localtime(&ts.tv_sec); else tm = gmtime(&ts.tv_sec); - - hwclock_set_time(tm); + clock_set_hwclock(tm); log_struct(LOG_INFO, MESSAGE_ID(SD_MESSAGE_TIME_CHANGE), - "REALTIME=%llu", (unsigned long long) timespec_load(&ts), + "REALTIME="USEC_FMT, timespec_load(&ts), "MESSAGE=Changed local time to %s", ctime(&ts.tv_sec), NULL); @@ -729,7 +601,7 @@ static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus if ((bool)ntp == c->use_ntp) return sd_bus_reply_method_return(m, NULL); - r = bus_verify_polkit_async(bus, &c->polkit_registry, m, "org.freedesktop.timedate1.set-ntp", interactive, error, method_set_ntp, c); + r = bus_verify_polkit_async(bus, &c->polkit_registry, m, CAP_SYS_TIME, "org.freedesktop.timedate1.set-ntp", interactive, error, method_set_ntp, c); if (r < 0) return r; if (r == 0) @@ -752,14 +624,12 @@ static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus return sd_bus_reply_method_return(m, NULL); } -#include - static const sd_bus_vtable timedate_vtable[] = { SD_BUS_VTABLE_START(0), SD_BUS_PROPERTY("Timezone", "s", NULL, offsetof(Context, zone), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), - SD_BUS_PROPERTY("LocalRTC", "b", NULL, offsetof(Context, local_rtc), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), - SD_BUS_PROPERTY("CanNTP", "b", bus_property_get_tristate, offsetof(Context, can_ntp), 0), - SD_BUS_PROPERTY("NTP", "b", bus_property_get_tristate, offsetof(Context, use_ntp), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("LocalRTC", "b", bus_property_get_bool, offsetof(Context, local_rtc), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("CanNTP", "b", bus_property_get_bool, offsetof(Context, can_ntp), 0), + SD_BUS_PROPERTY("NTP", "b", bus_property_get_bool, offsetof(Context, use_ntp), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("NTPSynchronized", "b", property_get_ntp_sync, 0, 0), SD_BUS_PROPERTY("TimeUSec", "t", property_get_time, 0, 0), SD_BUS_PROPERTY("RTCTimeUSec", "t", property_get_rtc_time, 0, 0), @@ -771,7 +641,7 @@ static const sd_bus_vtable timedate_vtable[] = { }; static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) { - _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int r; assert(c); @@ -784,7 +654,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) { return r; } - r = sd_bus_add_object_vtable(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c); + 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; @@ -809,15 +679,9 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) { } int main(int argc, char *argv[]) { - Context context = { - .zone = NULL, - .local_rtc = false, - .can_ntp = -1, - .use_ntp = -1, - }; - + Context context = {}; _cleanup_event_unref_ sd_event *event = NULL; - _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int r; log_set_target(LOG_TARGET_AUTO); @@ -863,7 +727,7 @@ int main(int argc, char *argv[]) { } finish: - context_free(&context, bus); + context_free(&context); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }