diff options
Diffstat (limited to 'src/resolve/resolved-link-bus.c')
| -rw-r--r-- | src/resolve/resolved-link-bus.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c index 3e06f1fe4..0ef8aebaa 100644 --- a/src/resolve/resolved-link-bus.c +++ b/src/resolve/resolved-link-bus.c @@ -18,7 +18,7 @@ static BUS_DEFINE_PROPERTY_GET(property_get_dnssec_supported, "b", Link, link_dnssec_supported); static BUS_DEFINE_PROPERTY_GET2(property_get_dnssec_mode, "s", Link, link_get_dnssec_mode, dnssec_mode_to_string); -static int property_get_private_dns_mode( +static int property_get_dns_over_tls_mode( sd_bus *bus, const char *path, const char *interface, @@ -32,7 +32,7 @@ static int property_get_private_dns_mode( assert(reply); assert(l); - return sd_bus_message_append(reply, "s", private_dns_mode_to_string(link_get_private_dns_mode(l))); + return sd_bus_message_append(reply, "s", dns_over_tls_mode_to_string(link_get_dns_over_tls_mode(l))); } static int property_get_dns( @@ -419,10 +419,10 @@ int bus_link_method_set_mdns(sd_bus_message *message, void *userdata, sd_bus_err return sd_bus_reply_method_return(message, NULL); } -int bus_link_method_set_private_dns(sd_bus_message *message, void *userdata, sd_bus_error *error) { +int bus_link_method_set_dns_over_tls(sd_bus_message *message, void *userdata, sd_bus_error *error) { Link *l = userdata; - const char *private_dns; - PrivateDnsMode mode; + const char *dns_over_tls; + DnsOverTlsMode mode; int r; assert(message); @@ -432,19 +432,19 @@ int bus_link_method_set_private_dns(sd_bus_message *message, void *userdata, sd_ if (r < 0) return r; - r = sd_bus_message_read(message, "s", &private_dns); + r = sd_bus_message_read(message, "s", &dns_over_tls); if (r < 0) return r; - if (isempty(private_dns)) - mode = _PRIVATE_DNS_MODE_INVALID; + if (isempty(dns_over_tls)) + mode = _DNS_OVER_TLS_MODE_INVALID; else { - mode = private_dns_mode_from_string(private_dns); + mode = dns_over_tls_mode_from_string(dns_over_tls); if (mode < 0) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid PrivateDNS setting: %s", private_dns); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid DNSOverTLS setting: %s", dns_over_tls); } - link_set_private_dns_mode(l, mode); + link_set_dns_over_tls_mode(l, mode); (void) link_save_user(l); @@ -557,7 +557,7 @@ const sd_bus_vtable link_vtable[] = { SD_BUS_PROPERTY("Domains", "a(sb)", property_get_domains, 0, 0), SD_BUS_PROPERTY("LLMNR", "s", bus_property_get_resolve_support, offsetof(Link, llmnr_support), 0), SD_BUS_PROPERTY("MulticastDNS", "s", bus_property_get_resolve_support, offsetof(Link, mdns_support), 0), - SD_BUS_PROPERTY("PrivateDNS", "s", property_get_private_dns_mode, 0, 0), + SD_BUS_PROPERTY("DNSOverTLS", "s", property_get_dns_over_tls_mode, 0, 0), SD_BUS_PROPERTY("DNSSEC", "s", property_get_dnssec_mode, 0, 0), SD_BUS_PROPERTY("DNSSECNegativeTrustAnchors", "as", property_get_ntas, 0, 0), SD_BUS_PROPERTY("DNSSECSupported", "b", property_get_dnssec_supported, 0, 0), @@ -566,7 +566,7 @@ const sd_bus_vtable link_vtable[] = { SD_BUS_METHOD("SetDomains", "a(sb)", NULL, bus_link_method_set_domains, 0), SD_BUS_METHOD("SetLLMNR", "s", NULL, bus_link_method_set_llmnr, 0), SD_BUS_METHOD("SetMulticastDNS", "s", NULL, bus_link_method_set_mdns, 0), - SD_BUS_METHOD("SetPrivateDNS", "s", NULL, bus_link_method_set_private_dns, 0), + SD_BUS_METHOD("SetDNSOverTLS", "s", NULL, bus_link_method_set_dns_over_tls, 0), SD_BUS_METHOD("SetDNSSEC", "s", NULL, bus_link_method_set_dnssec, 0), SD_BUS_METHOD("SetDNSSECNegativeTrustAnchors", "as", NULL, bus_link_method_set_dnssec_negative_trust_anchors, 0), SD_BUS_METHOD("Revert", NULL, NULL, bus_link_method_revert, 0), |