From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Fri, 14 Nov 2025 23:01:36 +0000 (+0000)
Subject: varlink: say which socket failed to bind in log message
X-Git-Tag: v259-rc1~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=555d8787490e926953c6696d2a43a8948290cd07;p=thirdparty%2Fsystemd.git

varlink: say which socket failed to bind in log message

Makes it a lot easier to debug failures
---

diff --git a/src/home/homed-manager.c b/src/home/homed-manager.c
index 2175ca7f3c1..a2ac04f2774 100644
--- a/src/home/homed-manager.c
+++ b/src/home/homed-manager.c
@@ -1101,7 +1101,7 @@ static int manager_bind_varlink(Manager *m) {
 
         r = sd_varlink_server_listen_address(m->varlink_server, socket_path, 0666 | SD_VARLINK_SERVER_MODE_MKDIR_0755);
         if (r < 0)
-                return log_error_errno(r, "Failed to bind to varlink socket: %m");
+                return log_error_errno(r, "Failed to bind to varlink socket '%s': %m", socket_path);
 
         r = sd_varlink_server_attach_event(m->varlink_server, m->event, SD_EVENT_PRIORITY_NORMAL);
         if (r < 0)
diff --git a/src/login/logind-varlink.c b/src/login/logind-varlink.c
index 757b4196fdf..ee83ed1b892 100644
--- a/src/login/logind-varlink.c
+++ b/src/login/logind-varlink.c
@@ -369,7 +369,7 @@ int manager_varlink_init(Manager *m, int fd) {
         else
                 r = sd_varlink_server_listen_fd(s, fd);
         if (r < 0)
-                return log_error_errno(r, "Failed to bind to varlink socket: %m");
+                return log_error_errno(r, "Failed to bind to varlink socket '/run/systemd/io.systemd.Login': %m");
 
         TAKE_FD(fd_close);
 
diff --git a/src/machine/machined-varlink.c b/src/machine/machined-varlink.c
index 13cf4713cf1..672bf919a0d 100644
--- a/src/machine/machined-varlink.c
+++ b/src/machine/machined-varlink.c
@@ -756,7 +756,7 @@ static int manager_varlink_init_userdb(Manager *m) {
 
         r = sd_varlink_server_listen_address(s, "/run/systemd/userdb/io.systemd.Machine", 0666 | SD_VARLINK_SERVER_MODE_MKDIR_0755);
         if (r < 0)
-                return log_error_errno(r, "Failed to bind to varlink socket: %m");
+                return log_error_errno(r, "Failed to bind to varlink socket '/run/systemd/userdb/io.systemd.Machine': %m");
 
         r = sd_varlink_server_attach_event(s, m->event, SD_EVENT_PRIORITY_NORMAL);
         if (r < 0)
diff --git a/src/network/networkd-manager-varlink.c b/src/network/networkd-manager-varlink.c
index 055c0902b3b..871e5a4636c 100644
--- a/src/network/networkd-manager-varlink.c
+++ b/src/network/networkd-manager-varlink.c
@@ -324,7 +324,7 @@ int manager_connect_varlink(Manager *m, int fd) {
         else
                 r = sd_varlink_server_listen_fd(s, fd);
         if (r < 0)
-                return log_error_errno(r, "Failed to bind to varlink socket: %m");
+                return log_error_errno(r, "Failed to bind to varlink socket '/run/systemd/netif/io.systemd.Network': %m");
 
         TAKE_FD(fd_close);
 
diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c
index 51fb5fe9dad..7ff245c4370 100644
--- a/src/oom/oomd-manager.c
+++ b/src/oom/oomd-manager.c
@@ -772,7 +772,7 @@ static int manager_varlink_init(Manager *m, int fd) {
         else
                 r = sd_varlink_server_listen_fd(s, fd);
         if (r < 0)
-                return log_error_errno(r, "Failed to bind to varlink socket: %m");
+                return log_error_errno(r, "Failed to bind to varlink socket '" VARLINK_ADDR_PATH_MANAGED_OOM_USER "': %m");
 
         r = sd_varlink_server_attach_event(s, m->event, SD_EVENT_PRIORITY_NORMAL);
         if (r < 0)
diff --git a/src/resolve/resolved-varlink.c b/src/resolve/resolved-varlink.c
index a4723176a88..90f4a9fffa8 100644
--- a/src/resolve/resolved-varlink.c
+++ b/src/resolve/resolved-varlink.c
@@ -1470,7 +1470,7 @@ static int varlink_monitor_server_init(Manager *m) {
         if (r == 0) {
                 r = sd_varlink_server_listen_address(server, "/run/systemd/resolve/io.systemd.Resolve.Monitor", 0666);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to bind to varlink socket: %m");
+                        return log_error_errno(r, "Failed to bind to varlink socket '/run/systemd/resolve/io.systemd.Resolve.Monitor': %m");
         }
 
         r = sd_varlink_server_attach_event(server, m->event, SD_EVENT_PRIORITY_NORMAL);
@@ -1526,7 +1526,7 @@ static int varlink_main_server_init(Manager *m) {
         if (r == 0) {
                 r = sd_varlink_server_listen_address(s, "/run/systemd/resolve/io.systemd.Resolve", 0666);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to bind to varlink socket: %m");
+                        return log_error_errno(r, "Failed to bind to varlink socket '/run/systemd/resolve/io.systemd.Resolve': %m");
         }
 
         r = sd_varlink_server_attach_event(s, m->event, SD_EVENT_PRIORITY_NORMAL);