From: Mike Yuan <me@yhndnzj.com>
Date: Sun, 27 Apr 2025 18:08:31 +0000 (+0200)
Subject: socket-activate: clean up control flow a bit
X-Git-Tag: v258-rc1~729^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a157f78f29d0da7cb39994fa7172b93c392969d;p=thirdparty%2Fsystemd.git

socket-activate: clean up control flow a bit
---

diff --git a/src/socket-activate/socket-activate.c b/src/socket-activate/socket-activate.c
index 0a367799f83..2f81316dfc3 100644
--- a/src/socket-activate/socket-activate.c
+++ b/src/socket-activate/socket-activate.c
@@ -483,15 +483,14 @@ static int run(int argc, char **argv) {
                 }
 
                 log_info("Communication attempt on fd %i.", event.data.fd);
-                if (arg_accept) {
-                        r = do_accept(exec_argv, event.data.fd);
-                        if (r < 0)
-                                return r;
-                } else
-                        break;
-        }
 
-        return exec_process(exec_argv, SD_LISTEN_FDS_START, (size_t) n);
+                if (!arg_accept)
+                        return exec_process(exec_argv, SD_LISTEN_FDS_START, (size_t) n);
+
+                r = do_accept(exec_argv, event.data.fd);
+                if (r < 0)
+                        return r;
+        }
 }
 
 DEFINE_MAIN_FUNCTION(run);