From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 27 Sep 2022 12:50:53 +0000 (+0200)
Subject: resolved: split out main server listening code from manager_varlink_init()
X-Git-Tag: v252-rc1~53^2~7
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=b497a958d651dc41c6c0551842a52c8a59b85930;p=systemd%2F.git

resolved: split out main server listening code from manager_varlink_init()

Just some minor refactoring, to make binding the two sockets (main +
minitor) symmetric
---

diff --git a/src/resolve/resolved-varlink.c b/src/resolve/resolved-varlink.c
index fd3f6262a7..cde406f40e 100644
--- a/src/resolve/resolved-varlink.c
+++ b/src/resolve/resolved-varlink.c
@@ -595,7 +595,7 @@ static int varlink_monitor_server_init(Manager *m) {
         return 0;
 }
 
-int manager_varlink_init(Manager *m) {
+static int varlink_main_server_init(Manager *m) {
         _cleanup_(varlink_server_unrefp) VarlinkServer *s = NULL;
         int r;
 
@@ -630,6 +630,15 @@ int manager_varlink_init(Manager *m) {
                 return log_error_errno(r, "Failed to attach varlink connection to event loop: %m");
 
         m->varlink_server = TAKE_PTR(s);
+        return 0;
+}
+
+int manager_varlink_init(Manager *m) {
+        int r;
+
+        r = varlink_main_server_init(m);
+        if (r < 0)
+                return r;
 
         r = varlink_monitor_server_init(m);
         if (r < 0)