diff options
| author | Iwan Timmer <irtimmer@gmail.com> | 2018-06-13 20:26:24 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-06-14 09:57:56 +0200 |
| commit | c9299be2f5a634881d6d9053cc93d093df040671 (patch) | |
| tree | 2334524eaa17c6b36775ef36a045ea6ed7705a88 /src/network | |
| parent | Merge pull request #9263 from poettering/log-serialize (diff) | |
| download | systemd-c9299be2f5a634881d6d9053cc93d093df040671.tar.xz systemd-c9299be2f5a634881d6d9053cc93d093df040671.zip | |
resolve: rename PrivateDNS to DNSOverTLS
PrivateDNS is not considered a good name for this option, so rename it to DNSOverTLS
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/networkd-link.c | 6 | ||||
| -rw-r--r-- | src/network/networkd-network-gperf.gperf | 2 | ||||
| -rw-r--r-- | src/network/networkd-network.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-network.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 805a4a7957..07827884f3 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -3762,9 +3762,9 @@ int link_save(Link *link) { fprintf(f, "MDNS=%s\n", resolve_support_to_string(link->network->mdns)); - if (link->network->private_dns_mode != _PRIVATE_DNS_MODE_INVALID) - fprintf(f, "PRIVATE_DNS=%s\n", - private_dns_mode_to_string(link->network->private_dns_mode)); + if (link->network->dns_over_tls_mode != _DNS_OVER_TLS_MODE_INVALID) + fprintf(f, "DNS_OVER_TLS=%s\n", + dns_over_tls_mode_to_string(link->network->dns_over_tls_mode)); if (link->network->dnssec_mode != _DNSSEC_MODE_INVALID) fprintf(f, "DNSSEC=%s\n", diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 38d168a596..6ad5257f79 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -60,7 +60,7 @@ Network.Domains, config_parse_domains, Network.DNS, config_parse_dns, 0, 0 Network.LLMNR, config_parse_resolve_support, 0, offsetof(Network, llmnr) Network.MulticastDNS, config_parse_resolve_support, 0, offsetof(Network, mdns) -Network.PrivateDNS, config_parse_private_dns_mode, 0, offsetof(Network, private_dns_mode) +Network.DNSOverTLS, config_parse_dns_over_tls_mode, 0, offsetof(Network, dns_over_tls_mode) Network.DNSSEC, config_parse_dnssec_mode, 0, offsetof(Network, dnssec_mode) Network.DNSSECNegativeTrustAnchors, config_parse_dnssec_negative_trust_anchors, 0, 0 Network.NTP, config_parse_ntp, 0, offsetof(Network, ntp) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index fc7d9a3474..7e47245a36 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -236,7 +236,7 @@ static int network_load_one(Manager *manager, const char *filename) { network->llmnr = RESOLVE_SUPPORT_YES; network->mdns = RESOLVE_SUPPORT_NO; network->dnssec_mode = _DNSSEC_MODE_INVALID; - network->private_dns_mode = _PRIVATE_DNS_MODE_INVALID; + network->dns_over_tls_mode = _DNS_OVER_TLS_MODE_INVALID; network->link_local = ADDRESS_FAMILY_IPV6; diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index 3136835f8c..0d5f3050a5 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -261,7 +261,7 @@ struct Network { ResolveSupport llmnr; ResolveSupport mdns; DnssecMode dnssec_mode; - PrivateDnsMode private_dns_mode; + DnsOverTlsMode dns_over_tls_mode; Set *dnssec_negative_trust_anchors; LIST_FIELDS(Network, networks); |