- Fix #4156: Fix systemd service manager state change notification.

git-svn-id: file:///svn/unbound/trunk@4913 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/daemon.c b/daemon/daemon.c
index a6bfe390271e76a40f0aa61943a5cb25854eaa45..4c3d5f1c1a174f0c34e9eea88f8890bf1c7576c1 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -660,18 +660,15 @@ daemon_fork(struct daemon* daemon)
 
        /* Start resolver service on main thread. */
 #ifdef HAVE_SYSTEMD
-       if(daemon->cfg->use_systemd)
-               sd_notify(0, "READY=1");
+       sd_notify(0, "READY=1");
 #endif
        log_info("start of service (%s).", PACKAGE_STRING);
        worker_work(daemon->workers[0]);
 #ifdef HAVE_SYSTEMD
-       if(daemon->cfg->use_systemd) {
-               if (daemon->workers[0]->need_to_exit)
-                       sd_notify(0, "STOPPING=1");
-               else
-                       sd_notify(0, "RELOADING=1");
-       }
+       if (daemon->workers[0]->need_to_exit)
+               sd_notify(0, "STOPPING=1");
+       else
+               sd_notify(0, "RELOADING=1");
 #endif
        log_info("service stopped (%s).", PACKAGE_STRING);
 

diff --git a/doc/Changelog b/doc/Changelog
index 0d73d348e5d24a5e5c35d7670efd9b034c01875b..274dfa7843c0a093ff49627b599433867ad962e5 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -9,6 +9,7 @@
        - Stop UDP to TCP failover after timeouts that causes the ping count
          to be reset by the TCP time measurement (that exists for TLS),
          because that causes the UDP part to not be measured as timeout.
+       - Fix #4156: Fix systemd service manager state change notification.
 
 13 September 2018: Wouter
        - Fix seed for random backup code to use explicit zero when wiped.