timesync: rename have_fallbacks -> fallback_set

(cherry picked from commit 1bb9306f1e96afe7f53dee98c17ebae4f572be74)
(cherry picked from commit 5d8d7e4828a89c1146859de14d0910673efddca7)
(cherry picked from commit bc305d20172f9846b2b35dc6965f14d347535b46)

diff --git a/src/timesync/test-timesync.c b/src/timesync/test-timesync.c
index 7993e4c12bc0a47b1f35a9c9ce5ec6dbb53dae9b..f0489cabbf269d30ab0f91915968d9b65436b94f 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 4b1d4ddbfe42dd4825d6ecc96f45fddd1e70d498..d0ee2d8c3d3c79927a938b1cc5ce8b8613e76eb4 100644 (file)
--- a/src/timesync/timesyncd-conf.c
+++ b/src/timesync/timesyncd-conf.c
@@ -19,7 +19,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;
@@ -58,7 +58,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 68fc8f8853aa6049949c770cce95d8af0c2519be..4001b574f5530d1494a00c9c399fb6878514206a 100644 (file)
--- a/src/timesync/timesyncd-manager.h
+++ b/src/timesync/timesyncd-manager.h
@@ -44,7 +44,7 @@ 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;