From: Harald Hoyer <harald@redhat.com>
Date: Wed, 17 Apr 2013 06:28:41 +0000 (+0200)
Subject: timedated: fixed NTP enabled: n/a
X-Git-Tag: v202~51
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=7e7d4da22925c329d668334aec3b3e7f21f63bc3;hp=ac714a78fdca481488d88f84b6332d28083a4511

timedated: fixed NTP enabled: n/a
---

diff --git a/TODO b/TODO
index f90c66b98..2d53cba3a 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 4efa806c3..bb134b7ff 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;
+                        }
                 }
         }