X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsocket.c;h=4a9c939936ee843f0164988935f985cf1b1f7fe4;hp=f998cada26b0e4c3f4cfd50d54cffd8ac64edaa3;hb=7c610628cd907b8d04dbfe28dd23a0fa958c7dcd;hpb=201e673c487bc321024a118936f3ded0893dc725

diff --git a/src/socket.c b/src/socket.c
index f998cada2..4a9c93993 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1033,7 +1033,18 @@ static void socket_enter_running(Socket *s, int cfd) {
         /* We don't take connections anymore if we are supposed to
          * shut down anyway */
         if (s->meta.job && s->meta.job->type == JOB_STOP) {
-                close_nointr_nofail(cfd);
+                if (cfd >= 0)
+                        close_nointr_nofail(cfd);
+                else  {
+                        /* Flush all sockets by closing and reopening them */
+                        socket_close_fds(s);
+
+                        if ((r = socket_watch_fds(s)) < 0) {
+                                log_warning("%s failed to watch sockets: %s", s->meta.id, strerror(-r));
+                                socket_enter_stop_pre(s, false);
+                        }
+                }
+
                 return;
         }