diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-06-14 10:45:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-14 10:45:02 +0200 |
| commit | 550c14fedd9aee8aa3ff3c43b728fc4464eac8ba (patch) | |
| tree | 73982259e6098a4b85785be4a422e285bf3ac9f2 /src | |
| parent | 6df8a6c753ed3b91464dd60d10fe4d291257870c (diff) | |
| parent | 4f571b4061f32a0d45371453470f55e858ee8c57 (diff) | |
| download | systemd-550c14fedd9aee8aa3ff3c43b728fc4464eac8ba.tar.gz | |
Merge pull request #16163 from DaanDeMeyer/resolved-edns-info
resolved: Don't complain too much when downgrading from EDNS
Diffstat (limited to 'src')
| -rw-r--r-- | src/resolve/resolved-dns-server.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c index 106b002bc6..60de1b29e7 100644 --- a/src/resolve/resolved-dns-server.c +++ b/src/resolve/resolved-dns-server.c @@ -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 instead of %s for DNS server %s.", + dns_server_feature_level_to_string(s->possible_feature_level), + dns_server_feature_level_to_string(p), dns_server_string(s)); } } |