summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-04-17 08:28:41 +0200
committerHarald Hoyer <harald@redhat.com>2013-04-17 08:28:41 +0200
commit7e7d4da22925c329d668334aec3b3e7f21f63bc3 (patch)
treef94839dc8c12cb378d21f55711352da49e4486be
parentac714a78fdca481488d88f84b6332d28083a4511 (diff)
timedated: fixed NTP enabled: n/a
-rw-r--r--TODO2
-rw-r--r--src/timedate/timedated.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/TODO b/TODO
index f90c66b981..2d53cba3a9 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,4 @@
Bugfixes:
-* timedatectl: NTP enabled: n/a
-
* systemctl --system show -p Fr<TAB> default.target doesn't show anything
* check systemd-tmpfiles for selinux context hookup for mknod(), symlink() and similar
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 4efa806c39..bb134b7fff 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -90,6 +90,8 @@ typedef struct TZ {
} TZ;
static TZ tz = {
+ .zone = NULL,
+ .local_rtc = false,
.can_ntp = -1,
.use_ntp = -1,
};
@@ -303,9 +305,10 @@ static char** get_ntp_services(void) {
if (l[0] == 0 || l[0] == '#')
continue;
- if (strv_extend(&r, l) < 0)
+ if (strv_extend(&r, l) < 0) {
log_oom();
- return NULL;
+ return NULL;
+ }
}
}