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

(cherry picked from commit a742f9828ea73d9c2c9bafe701c10fe60f058012)

diff --git a/src/resolve/resolv.conf b/src/resolve/resolv.conf
index c3079aca1d4279a573ff265931e5447e51248f65..dc5ac05532abceb358567da9a6f778be557d3fc0 100644 (file)
--- 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 f5fc13563daf2b75467ab80c85df6fa2ee321365..1896ce3379c9e45d964f50d66e9ac4c17141f34e 100644 (file)
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -325,7 +325,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);