]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
resolved: Don't complain too much when downgrading from EDNS
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 12 Jun 2020 18:17:15 +0000 (20:17 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 12 Jun 2020 18:17:15 +0000 (20:17 +0200)
src/resolve/resolved-dns-server.c

index 106b002bc6dc498b601e8edc7f94c2c5de71f5f9..557b31602b1966882912d9644d978df00805a020 100644 (file)
@@ -422,6 +422,7 @@ DnsServerFeatureLevel dns_server_possible_feature_level(DnsServer *s) {
                 s->possible_feature_level = s->verified_feature_level;
         else {
                 DnsServerFeatureLevel p = s->possible_feature_level;
+                int log_level = LOG_WARNING;
 
                 if (s->n_failed_tcp >= DNS_SERVER_FEATURE_RETRY_ATTEMPTS &&
                     s->possible_feature_level == DNS_SERVER_FEATURE_LEVEL_TCP) {
@@ -449,6 +450,10 @@ DnsServerFeatureLevel dns_server_possible_feature_level(DnsServer *s) {
                         log_debug("Server doesn't support EDNS(0) properly, downgrading feature level...");
                         s->possible_feature_level = DNS_SERVER_FEATURE_LEVEL_UDP;
 
+                        /* Users often don't control the DNS server they use so let's not complain too loudly
+                         * when we can't use EDNS because the DNS server doesn't support it. */
+                        log_level = LOG_NOTICE;
+
                 } else if (s->packet_rrsig_missing &&
                            s->possible_feature_level >= DNS_SERVER_FEATURE_LEVEL_DO) {
 
@@ -493,9 +498,9 @@ DnsServerFeatureLevel dns_server_possible_feature_level(DnsServer *s) {
                         /* We changed the feature level, reset the counting */
                         dns_server_reset_counters(s);
 
-                        log_warning("Using degraded feature set (%s) for DNS server %s.",
-                                    dns_server_feature_level_to_string(s->possible_feature_level),
-                                    dns_server_string(s));
+                        log_full(log_level, "Using degraded feature set (%s) for DNS server %s.",
+                                 dns_server_feature_level_to_string(s->possible_feature_level),
+                                 dns_server_string(s));
                 }
         }