fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 10:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: honor the send_hostname property

Browse source
This commit is contained in:
Beniamino Galvani 2021-10-19 20:34:47 +02:00
parent 32443ef3b5
commit 8d40d03a2c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/dhcp/nm-dhcp-client.c
View file

@ -1012,8 +1012,10 @@ config_init(NMDhcpClientConfig *config, const NMDhcpClientConfig *src)
} }
if (config->hostname) { if (config->hostname) {
if ((config->use_fqdn && !nm_sd_dns_name_is_valid(config->hostname)) if (!config->send_hostname) {
|| (!config->use_fqdn && !nm_sd_hostname_is_valid(config->hostname, FALSE))) { nm_clear_g_free((gpointer *) &config->hostname);
} else if ((config->use_fqdn && !nm_sd_dns_name_is_valid(config->hostname))
|| (!config->use_fqdn && !nm_sd_hostname_is_valid(config->hostname, FALSE))) {
nm_log_warn(LOGD_DHCP, nm_log_warn(LOGD_DHCP,
"dhcp%c: %s '%s' is invalid, will be ignored", "dhcp%c: %s '%s' is invalid, will be ignored",
nm_utils_addr_family_to_char(config->addr_family), nm_utils_addr_family_to_char(config->addr_family),