From 872603b583814ddcd67a32c1d027589d4fba1885 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 16 Jun 2025 17:45:11 +0900 Subject: [PATCH] resolve: several cleanups for manager_new() - mention the error is ignored in the log message, - drop redundant log message, as dnssd_load() logs on failure, - voidify manager_load_delegates(). --- src/resolve/resolved-manager.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 490b57cdaff..7d098513198 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -734,7 +734,7 @@ int manager_new(Manager **ret) { r = manager_parse_config_file(m); if (r < 0) - log_warning_errno(r, "Failed to parse configuration file: %m"); + log_warning_errno(r, "Failed to parse configuration file, ignoring: %m"); #if ENABLE_DNS_OVER_TLS r = dnstls_manager_init(m); @@ -756,11 +756,8 @@ int manager_new(Manager **ret) { if (r < 0) return r; - r = dnssd_load(m); - if (r < 0) - log_warning_errno(r, "Failed to load DNS-SD configuration files: %m"); - - manager_load_delegates(m); + (void) dnssd_load(m); + (void) manager_load_delegates(m); r = dns_scope_new(m, &m->unicast_scope, DNS_SCOPE_GLOBAL, /* link= */ NULL, /* delegate= */ NULL, DNS_PROTOCOL_DNS, AF_UNSPEC); if (r < 0) -- 2.47.3