From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 4 Sep 2020 07:26:17 +0000 (+0900)
Subject: resolve: adjust error messages
X-Git-Tag: v247-rc1~292^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c17bcb3ad2b164917f3c0f72a3f067a81b72c13;p=thirdparty%2Fsystemd.git

resolve: adjust error messages
---

diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c
index 88a6a0616af..a8011d16f30 100644
--- a/src/resolve/resolved-dns-stub.c
+++ b/src/resolve/resolved-dns-stub.c
@@ -534,19 +534,11 @@ static int manager_dns_stub_udp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
         return 0;
 
 fail:
+        assert(r < 0);
         (void) in_addr_port_to_string(l->family, &l->address, l->port, &pretty);
         if (r == -EADDRINUSE)
-                return log_warning_errno(r,
-                                         "Another process is already listening on UDP socket %s.\n"
-                                         "Turning off local DNS stub extra support.", strnull(pretty));
-        if (r == -EPERM)
-                return log_warning_errno(r,
-                                         "Failed to listen on UDP socket %s: %m.\n"
-                                         "Turning off local DNS stub extra support.", strnull(pretty));
-
-        assert(r < 0);
-
-        return log_warning_errno(r, "Failed to listen on UDP socket %s, ignoring: %m", strnull(pretty));
+                return log_warning_errno(r, "Another process is already listening on UDP socket %s: %m", strnull(pretty));
+        return log_warning_errno(r, "Failed to listen on UDP socket %s: %m", strnull(pretty));
 }
 
 static int on_dns_stub_stream_packet(DnsStream *s) {
@@ -706,19 +698,11 @@ static int manager_dns_stub_tcp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
         return 0;
 
 fail:
+        assert(r < 0);
         (void) in_addr_port_to_string(l->family, &l->address, l->port, &pretty);
         if (r == -EADDRINUSE)
-                return log_warning_errno(r,
-                                         "Another process is already listening on TCP socket %s.\n"
-                                         "Turning off local DNS stub extra support.", strnull(pretty));
-        if (r == -EPERM)
-                return log_warning_errno(r,
-                                         "Failed to listen on TCP socket %s: %m.\n"
-                                         "Turning off local DNS stub extra support.", strnull(pretty));
-
-        assert(r < 0);
-
-        return log_warning_errno(r, "Failed to listen on TCP socket %s, ignoring: %m", strnull(pretty));
+                return log_warning_errno(r, "Another process is already listening on TCP socket %s: %m", strnull(pretty));
+        return log_warning_errno(r, "Failed to listen on TCP socket %s: %m", strnull(pretty));
 }
 
 int manager_dns_stub_start(Manager *m) {