From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 9 Oct 2016 19:04:59 +0000 (-0400)
Subject: resolved: also disable stub listener on EPERM
X-Git-Tag: v232~129^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f4db364c940d4ad672f9a62d3077aeef89d8629;p=thirdparty%2Fsystemd.git

resolved: also disable stub listener on EPERM

When running in a user namespace without private networking, resolved would
fail to start. There isn't much difference between EADDRINUSE and EPERM,
so treat them the same, except for the warning message text.
---

diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c
index 24309495254..b1c570cee6e 100644
--- a/src/resolve/resolved-dns-stub.c
+++ b/src/resolve/resolved-dns-stub.c
@@ -511,9 +511,15 @@ int manager_dns_stub_start(Manager *m) {
                 r = manager_dns_stub_tcp_fd(m);
         }
 
-        if (r == -EADDRINUSE) {
-                log_warning("Another process is already listening on %s socket 127.0.0.53:53.\n"
-                            "Turning off local DNS stub support.", t);
+        if (IN_SET(r, -EADDRINUSE, -EPERM)) {
+                if (r == -EADDRINUSE)
+                        log_warning_errno(r,
+                                          "Another process is already listening on %s socket 127.0.0.53:53.\n"
+                                          "Turning off local DNS stub support.", t);
+                else
+                        log_warning_errno(r,
+                                          "Failed to listen on %s socket 127.0.0.53:53: %m.\n"
+                                          "Turning off local DNS stub support.", t);
                 manager_dns_stub_stop(m);
         } else if (r < 0)
                 return log_error_errno(r, "Failed to listen on %s socket 127.0.0.53:53: %m", t);