]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core/socket: close fds also on SOCKET_CLEAN state
authorMike Yuan <me@yhndnzj.com>
Mon, 16 Dec 2024 00:28:02 +0000 (01:28 +0100)
committerMike Yuan <me@yhndnzj.com>
Mon, 30 Dec 2024 20:43:52 +0000 (21:43 +0100)
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.

src/core/socket.c

index 9234a9187657243bc14b812c33f2245726925c34..d37bdea9266b38af83fd1135bac7f72d420b52df 100644 (file)
@@ -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)