X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimedate%2Ftimedated.c;h=3895e321c2895b18571d6df1d63efd58346a87eb;hp=a8261fee380d92d6e14381526fcc4764f19249cf;hb=d8c21348dfe8abd6557366f7982886248544e87a;hpb=ebcf1f97de4f6b1580ae55eb56b1a3939fe6b602

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index a8261fee3..3895e321c 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -126,7 +126,7 @@ static int context_read_data(Context *c) {
         r = readlink_malloc("/etc/localtime", &t);
         if (r < 0) {
                 if (r == -EINVAL)
-                        log_warning("/etc/localtime should be a symbolic link to a timezone data file in /usr/share/zoneinfo/.");
+                        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));
         } else {
@@ -137,7 +137,7 @@ static int context_read_data(Context *c) {
                         e = path_startswith(t, "../usr/share/zoneinfo/");
 
                 if (!e)
-                        log_warning("/etc/localtime should be a symbolic link to a timezone data file in /usr/share/zoneinfo/.");
+                        log_warning("/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/.");
                 else {
                         c->zone = strdup(e);
                         if (!c->zone)
@@ -263,9 +263,8 @@ static char** get_ntp_services(void) {
                         char line[PATH_MAX], *l;
 
                         if (!fgets(line, sizeof(line), f)) {
-
                                 if (ferror(f))
-                                        log_error("Failed to read NTP units file: %m");
+                                        log_error("Failed to read NTP unit file: %m");
 
                                 break;
                         }
@@ -313,7 +312,7 @@ static int context_read_ntp(Context *c, sd_bus *bus) {
                                 *i);
 
                 if (r < 0) {
-                        /* This implementation does not exist, try next one */
+                        /* This implementation does not exist. Try the next one. */
                         if (sd_bus_error_has_name(&error, SD_BUS_ERROR_FILE_NOT_FOUND))
                                 continue;
 
@@ -376,7 +375,7 @@ static int context_start_ntp(Context *c, sd_bus *bus, sd_bus_error *error) {
                         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 next one */
+                                /* This implementation does not exist. Try the next one. */
                                 sd_bus_error_free(error);
                                 continue;
                         }
@@ -425,7 +424,7 @@ static int context_enable_ntp(Context*c, sd_bus *bus, sd_bus_error *error) {
 
                 if (r < 0) {
                         if (sd_bus_error_has_name(error, SD_BUS_ERROR_FILE_NOT_FOUND)) {
-                                /* This implementation does not exist, try next one */
+                                /* This implementation does not exist. Try the next one. */
                                 sd_bus_error_free(error);
                                 continue;
                         }
@@ -468,8 +467,11 @@ static int property_get_rtc_time(
         zero(tm);
         r = hwclock_get_time(&tm);
         if (r == -EBUSY) {
-                log_warning("/dev/rtc is busy, is somebody keeping it open continously? That's not a good idea... Returning a bogus RTC timestamp.");
+                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;
+        } else if (r == -ENOENT) {
+                log_debug("/dev/rtc not found.");
+                t = 0; /* no RTC found */
         } else if (r < 0)
                 return sd_bus_error_set_errnof(error, r, "Failed to read RTC: %s", strerror(-r));
         else
@@ -539,8 +541,8 @@ 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 timezone: %s", strerror(-r));
-                return sd_bus_error_set_errnof(error, r, "Failed to set timezone: %s", strerror(-r));
+                log_error("Failed to set time zone: %s", strerror(-r));
+                return sd_bus_error_set_errnof(error, r, "Failed to set time zone: %s", strerror(-r));
         }
 
         /* 2. Tell the kernel our timezone */
@@ -559,7 +561,7 @@ 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),
                    "TIMEZONE=%s", c->zone,
-                   "MESSAGE=Changed timezone to '%s'.", c->zone,
+                   "MESSAGE=Changed time zone to '%s'.", c->zone,
                    NULL);
 
         sd_bus_emit_properties_changed(bus, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", "Timezone", NULL);
@@ -750,6 +752,8 @@ 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 <sys/capability.h>
+
 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),
@@ -759,10 +763,10 @@ static const sd_bus_vtable timedate_vtable[] = {
         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),
-        SD_BUS_METHOD("SetTime", "xbb", NULL, method_set_time, 0),
-        SD_BUS_METHOD("SetTimezone", "sb", NULL, method_set_timezone, 0),
-        SD_BUS_METHOD("SetLocalRTC", "bbb", NULL, method_set_local_rtc, 0),
-        SD_BUS_METHOD("SetNTP", "bb", NULL, method_set_ntp, 0),
+        SD_BUS_METHOD("SetTime", "xbb", NULL, method_set_time, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetTimezone", "sb", NULL, method_set_timezone, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetLocalRTC", "bbb", NULL, method_set_local_rtc, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetNTP", "bb", NULL, method_set_ntp, SD_BUS_VTABLE_UNPRIVILEGED),
         SD_BUS_VTABLE_END,
 };
 
@@ -786,17 +790,12 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
                 return r;
         }
 
-        r = sd_bus_request_name(bus, "org.freedesktop.timedate1", SD_BUS_NAME_DO_NOT_QUEUE);
+        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 != SD_BUS_NAME_PRIMARY_OWNER) {
-                log_error("Failed to acquire name.");
-                return -EEXIST;
-        }
-
         r = sd_bus_attach_event(bus, event, 0);
         if (r < 0) {
                 log_error("Failed to attach bus to event loop: %s", strerror(-r));
@@ -839,13 +838,15 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        sd_event_set_watchdog(event, true);
+
         r = connect_bus(&context, event, &bus);
         if (r < 0)
                 goto finish;
 
         r = context_read_data(&context);
         if (r < 0) {
-                log_error("Failed to read timezone data: %s", strerror(-r));
+                log_error("Failed to read time zone data: %s", strerror(-r));
                 goto finish;
         }
 
@@ -855,14 +856,12 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        r = bus_event_loop_with_idle(event, bus, "org.freedesktop.timedate1", DEFAULT_EXIT_USEC);
+        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));
                 goto finish;
         }
 
-        r = 0;
-
 finish:
         context_free(&context, bus);