From: Mike Yuan <me@yhndnzj.com>
Date: Mon, 16 Dec 2024 00:28:02 +0000 (+0100)
Subject: core/socket: close fds also on SOCKET_CLEAN state
X-Git-Tag: v258-rc1~1752^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1e3536d6b6550df5df4a87f1c8e4bf9d80a6678;p=thirdparty%2Fsystemd.git

core/socket: close fds also on SOCKET_CLEAN state

Follow-up for c968d76a382f905b419cacd23a6b20aa31aca580

We'd only transition to SOCKET_CLEAN state if previously
inactive (see socket_clean()), hence no fds shall be persisted
in this state.
---

diff --git a/src/core/socket.c b/src/core/socket.c
index 9234a918765..d37bdea9266 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1845,8 +1845,7 @@ static void socket_set_state(Socket *s, SocketState state) {
                     SOCKET_RUNNING,
                     SOCKET_STOP_PRE,
                     SOCKET_STOP_PRE_SIGTERM,
-                    SOCKET_STOP_PRE_SIGKILL,
-                    SOCKET_CLEANING))
+                    SOCKET_STOP_PRE_SIGKILL))
                 socket_close_fds(s);
 
         if (state != old_state)