summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYmrDtnJu <YmrDtnJu@users.noreply.github.com>2020-06-05 15:36:58 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2020-06-06 10:40:45 +0200
commita742f9828ea73d9c2c9bafe701c10fe60f058012 (patch)
treed31ce1c82149657758013f3d481b419bae725539
parent9141594cae1dfd2a17057d3d1effbd2164b1c235 (diff)
downloadsystemd-a742f9828ea73d9c2c9bafe701c10fe60f058012.tar.gz
resolve: enable RES_TRUSTAD towards the 127.0.0.53 stub resolver
glibc 2.31 strips the AD flag, unless either the application specifies RES_TRUSTAD or the options in resolv.conf contain trust-ad. See https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=NEWS;hb=HEAD
-rw-r--r--src/resolve/resolv.conf2
-rw-r--r--src/resolve/resolved-resolv-conf.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/resolve/resolv.conf b/src/resolve/resolv.conf
index c3079aca1d..dc5ac05532 100644
--- a/src/resolve/resolv.conf
+++ b/src/resolve/resolv.conf
@@ -15,4 +15,4 @@
# operation for /etc/resolv.conf.
nameserver 127.0.0.53
-options edns0
+options edns0 trust-ad
diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index 97aee7abc8..c6f48d6d88 100644
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -307,7 +307,7 @@ static int write_stub_resolv_conf_contents(FILE *f, OrderedSet *dns, OrderedSet
"# operation for /etc/resolv.conf.\n"
"\n"
"nameserver 127.0.0.53\n"
- "options edns0\n", f);
+ "options edns0 trust-ad\n", f);
if (!ordered_set_isempty(domains))
write_resolv_conf_search(domains, f);