diff --git a/man/systemd.network.xml b/man/systemd.network.xml index dbf074b8d92..d0bd0c57d45 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -1935,18 +1935,12 @@ IPv6Token=prefixstable:2002:da8:1:: UseDNS= UseNTP= + UseHostname= As in the [DHCPv4] section. - - UseFQDN= - - Equivalent of UseHostname= in the [DHCPv4] section. - - - RouteMetric= diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index b36efd811c4..72bb46b1865 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -1076,9 +1076,10 @@ static int dhcp6_address_acquired(Link *link) { return r; } - if (link->network->dhcp6_use_fqdn) { + if (link->network->dhcp6_use_hostname) { const char *dhcpname = NULL; _cleanup_free_ char *hostname = NULL; + (void) sd_dhcp6_lease_get_fqdn(link->dhcp6_lease, &dhcpname); if (dhcpname) { diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 348c27d4e1b..60ac30fbce6 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -225,7 +225,7 @@ DHCPv4.RouteMTUBytes, config_parse_mtu, DHCPv4.FallbackLeaseLifetimeSec, config_parse_dhcp_fallback_lease_lifetime, 0, 0 DHCPv6.UseAddress, config_parse_bool, 0, offsetof(Network, dhcp6_use_address) DHCPv6.UseDNS, config_parse_dhcp_use_dns, 0, 0 -DHCPv6.UseFQDN, config_parse_bool, 0, offsetof(Network, dhcp6_use_fqdn) +DHCPv6.UseHostname, config_parse_bool, 0, offsetof(Network, dhcp6_use_hostname) DHCPv6.UseNTP, config_parse_dhcp_use_ntp, 0, 0 DHCPv6.RapidCommit, config_parse_bool, 0, offsetof(Network, dhcp6_rapid_commit) DHCPv6.MUDURL, config_parse_dhcp6_mud_url, 0, 0 diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 609170e1cae..4f0dfe469f0 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -373,7 +373,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi .dhcp6_use_address = true, .dhcp6_use_dns = true, - .dhcp6_use_fqdn = true, + .dhcp6_use_hostname = true, .dhcp6_use_ntp = true, .dhcp6_rapid_commit = true, .dhcp6_route_metric = DHCP_ROUTE_METRIC, diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index fc3d5a8a7f9..48419c27fec 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -159,7 +159,7 @@ struct Network { bool dhcp6_use_address; bool dhcp6_use_dns; bool dhcp6_use_dns_set; - bool dhcp6_use_fqdn; + bool dhcp6_use_hostname; bool dhcp6_use_ntp; bool dhcp6_use_ntp_set; bool dhcp6_rapid_commit; diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network index c8fb0565a45..d20fb78f153 100644 --- a/test/fuzz/fuzz-network-parser/directives.network +++ b/test/fuzz/fuzz-network-parser/directives.network @@ -127,7 +127,7 @@ FallbackLeaseLifetimeSec= UseAddress= UseNTP= UseDNS= -UseFQDN= +UseHostname= RapidCommit= ForceDHCPv6PDOtherInformation= PrefixDelegationHint=