resolved: add missing error code check when initializing DNS-over-TLS

[thirdparty/systemd.git] / src / resolve / resolved-dns-server.c

diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c
index b85eb75273c934370347f638373723b0ef8b9d4b..0033de73b4f35eb9636ab3397a70bc14ce510c57 100644 (file)
--- a/src/resolve/resolved-dns-server.c
+++ b/src/resolve/resolved-dns-server.c
@@ -82,10 +82,6 @@ int dns_server_new(
 
         s->linked = true;
 
-#if ENABLE_DNS_OVER_TLS
-        dnstls_server_init(s);
-#endif
-
         /* A new DNS server that isn't fallback is added and the one
          * we used so far was a fallback one? Then let's try to pick
          * the new one */
@@ -239,7 +235,7 @@ static void dns_server_reset_counters(DnsServer *s) {
          *
          * This is particularly important to deal with certain Belkin routers which break OPT for certain lookups (A),
          * but pass traffic through for others (AAAA). If we detect the broken behaviour on one lookup we should not
-         * reenable it for another, because we cannot validate things anyway, given that the RRSIG/OPT data will be
+         * re-enable it for another, because we cannot validate things anyway, given that the RRSIG/OPT data will be
          * incomplete. */
 }
 
@@ -836,7 +832,7 @@ void dns_server_dump(DnsServer *s, FILE *f) {
                 assert(s->link);
 
                 fputs(" interface=", f);
-                fputs(s->link->name, f);
+                fputs(s->link->ifname, f);
         }
 
         fputs("]\n", f);
@@ -879,7 +875,7 @@ void dns_server_unref_stream(DnsServer *s) {
 
         /* Detaches the default stream of this server. Some special care needs to be taken here, as that stream and
          * this server reference each other. First, take the stream out of the server. It's destructor will check if it
-         * is registered with us, hence let's invalidate this separatly, so that it is already unregistered. */
+         * is registered with us, hence let's invalidate this separately, so that it is already unregistered. */
         ref = TAKE_PTR(s->stream);
 
         /* And then, unref it */