From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 4 Sep 2020 06:10:48 +0000 (+0900)
Subject: resolve: do not set IP_TTL for extra DNS stub listeners
X-Git-Tag: v247-rc1~292^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d40f00d79819616ad5dc1693ae0c899ede415e6f;p=thirdparty%2Fsystemd.git

resolve: do not set IP_TTL for extra DNS stub listeners
---

diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c
index fc169ee0ef4..e6116244588 100644
--- a/src/resolve/resolved-dns-stub.c
+++ b/src/resolve/resolved-dns-stub.c
@@ -652,9 +652,8 @@ static int manager_dns_stub_tcp_fd_extra(Manager *m, DNSStubListenerExtra *l) {
         if (r < 0)
                 goto fail;
 
-        r = setsockopt_int(fd, IPPROTO_IP, IP_TTL, 1);
-        if (r < 0)
-                goto fail;
+        /* Do not set IP_TTL for extra DNS stub listners, as the address may not be local and in that
+         * case people may want ttl > 1. */
 
         r = setsockopt_int(fd, IPPROTO_IP, IP_FREEBIND, true);
         if (r < 0)