timesyncd: make use of floating event sources for signal handling

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 21843363d2ac03259ad7b48cb980f45c25b2eb52..19e6d67c63d6203c9221455420852b3eb5ce97cc 100644 (file)
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -978,8 +978,8 @@ static int manager_new(Manager **ret) {
 
         sd_event_set_watchdog(m->event, true);
 
 
         sd_event_set_watchdog(m->event, true);
 

-        sd_event_add_signal(m->event, &m->sigterm, SIGTERM, NULL,  NULL);
-        sd_event_add_signal(m->event, &m->sigint, SIGINT, NULL, NULL);
+        sd_event_add_signal(m->event, NULL, SIGTERM, NULL,  NULL);
+        sd_event_add_signal(m->event, NULL, SIGINT, NULL, NULL);

 
         r = sd_resolve_default(&m->resolve);
         if (r < 0)
 
         r = sd_resolve_default(&m->resolve);
         if (r < 0)


@@ -1006,9 +1006,6 @@ static void manager_free(Manager *m) {
         manager_disconnect(m);
         manager_flush_names(m);
 
         manager_disconnect(m);
         manager_flush_names(m);
 

-        sd_event_source_unref(m->sigint);
-        sd_event_source_unref(m->sigterm);
-

         sd_event_source_unref(m->event_retry);
 
         sd_event_source_unref(m->network_event_source);
         sd_event_source_unref(m->event_retry);
 
         sd_event_source_unref(m->network_event_source);

diff --git a/src/timesync/timesyncd.h b/src/timesync/timesyncd.h
index 370b966fc69cca70d54afc3ee31a0f2b5d8c1bbb..471d4b0a1254b57474773f0e3b202647002b1868 100644 (file)
--- a/src/timesync/timesyncd.h
+++ b/src/timesync/timesyncd.h
@@ -92,9 +92,6 @@ struct Manager {
 
         /* Retry connections */
         sd_event_source *event_retry;
 
         /* Retry connections */
         sd_event_source *event_retry;

-
-        /* Handle SIGINT/SIGTERM */
-        sd_event_source *sigterm, *sigint;

 };
 
 const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);
 };
 
 const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);