From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 27 Jan 2022 07:19:10 +0000 (+0900)
Subject: sd-dhcp-server: do not log "STOPPED" when already stopped
X-Git-Tag: v251-rc1~396^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a195d4186260a57fc32a69f103d1040c1e27972;p=thirdparty%2Fsystemd.git

sd-dhcp-server: do not log "STOPPED" when already stopped
---

diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
index 1d27d28959b..f80e687ca72 100644
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -165,8 +165,6 @@ DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
 static sd_dhcp_server *dhcp_server_free(sd_dhcp_server *server) {
         assert(server);
 
-        log_dhcp_server(server, "UNREF");
-
         sd_dhcp_server_stop(server);
 
         sd_event_unref(server->event);
@@ -280,9 +278,13 @@ sd_event *sd_dhcp_server_get_event(sd_dhcp_server *server) {
 }
 
 int sd_dhcp_server_stop(sd_dhcp_server *server) {
+        bool running;
+
         if (!server)
                 return 0;
 
+        running = sd_dhcp_server_is_running(server);
+
         server->receive_message = sd_event_source_disable_unref(server->receive_message);
         server->receive_broadcast = sd_event_source_disable_unref(server->receive_broadcast);
 
@@ -290,7 +292,8 @@ int sd_dhcp_server_stop(sd_dhcp_server *server) {
         server->fd = safe_close(server->fd);
         server->fd_broadcast = safe_close(server->fd_broadcast);
 
-        log_dhcp_server(server, "STOPPED");
+        if (running)
+                log_dhcp_server(server, "STOPPED");
 
         return 0;
 }