timesync: rename have_fallbacks -> fallback_set

diff --git a/src/timesync/test-timesync.c b/src/timesync/test-timesync.c
index 7cbdd4060d967dfd585990090eca3db212abb007..5f4ffa5953a6e528e6412c2e7dfb01afaa0c738b 100644 (file)
--- a/src/timesync/test-timesync.c
+++ b/src/timesync/test-timesync.c
@@ -15,9 +15,9 @@ TEST(manager_parse_string) {
 
         assert_se(manager_new(&m) == 0);
 
-        assert_se(!m->have_fallbacks);
+        assert_se(!m->fallback_set);
         assert_se(manager_parse_server_string(m, SERVER_FALLBACK, NTP_SERVERS) == 0);
-        assert_se(m->have_fallbacks);
+        assert_se(m->fallback_set);
         assert_se(manager_parse_fallback_string(m, NTP_SERVERS) == 0);
 
         assert_se(manager_parse_server_string(m, SERVER_SYSTEM, "time1.foobar.com time2.foobar.com axrfav.,avf..ra 12345..123") == 0);

diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c
index 0c7d9f39c1470b4fc3d2d220d29301b6536f42a4..1ae4156520157421869acdc595818d00a9fcf7ce 100644 (file)
--- a/src/timesync/timesyncd-conf.c
+++ b/src/timesync/timesyncd-conf.c
@@ -20,7 +20,7 @@ int manager_parse_server_string(Manager *m, ServerType type, const char *string)
         first = type == SERVER_FALLBACK ? m->fallback_servers : m->system_servers;
 
         if (type == SERVER_FALLBACK)
-                 m->have_fallbacks = true;
+                 m->fallback_set = true;
 
         for (;;) {
                 _cleanup_free_ char *word = NULL;
@@ -59,7 +59,7 @@ int manager_parse_server_string(Manager *m, ServerType type, const char *string)
 }
 
 int manager_parse_fallback_string(Manager *m, const char *string) {
-        if (m->have_fallbacks)
+        if (m->fallback_set)
                 return 0;
 
         return manager_parse_server_string(m, SERVER_FALLBACK, string);

diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h
index 252e5164d338a3c8e99461c95e9890b17823d6bb..9966b64ac6976ee6e6a873ac2da6f66ec9e6cddb 100644 (file)
--- a/src/timesync/timesyncd-manager.h
+++ b/src/timesync/timesyncd-manager.h
@@ -33,7 +33,7 @@ typedef struct Manager {
 
         RateLimit ratelimit;
         bool exhausted_servers;
-        bool have_fallbacks;
+        bool fallback_set; /* Indicate if FallbackNTP= is explicitly configured. */
 
         /* network */
         sd_event_source *network_event_source;