morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

sd-dhcp-lease: use the last hostname option when multiple hostname is specified

Browse Source
This commit is contained in:
Yu Watanabe
2025-11-16 06:10:58 +09:00
parent a6c61b4adc
commit af70b7521f
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libsystemd-network/dhcp-lease-internal.h
View File

@@ -66,7 +66,8 @@ struct sd_dhcp_lease {
char *domainname;
char **search_domains;
char *hostname;
char *hostname; /* SD_DHCP_OPTION_HOST_NAME (12) */
char *fqdn; /* SD_DHCP_OPTION_FQDN (81) */
char *root_path;
char *captive_portal;

18
src/libsystemd-network/sd-dhcp-lease.c
View File

@@ -199,10 +199,15 @@ int sd_dhcp_lease_get_hostname(sd_dhcp_lease *lease, const char **hostname) {
assert_return(lease, -EINVAL);
assert_return(hostname, -EINVAL);
if (!lease->hostname)
/* FQDN option (81) always takes precedence. */
if (lease->fqdn)
*hostname = lease->fqdn;
else if (lease->hostname)
*hostname = lease->hostname;
else
return -ENODATA;
*hostname = lease->hostname;
return 0;
}
@@ -422,6 +427,7 @@ static sd_dhcp_lease *dhcp_lease_free(sd_dhcp_lease *lease) {
free(lease->router);
free(lease->timezone);
free(lease->hostname);
free(lease->fqdn);
free(lease->domainname);
free(lease->captive_portal);
@@ -1013,12 +1019,6 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
break;
case SD_DHCP_OPTION_HOST_NAME:
/* FQDN option (81) always takes precedence. If it was already set, do not overwrite it. */
if (lease->hostname) {
log_debug("Hostname already set via FQDN, ignoring hostname option.");
break;
}
r = lease_parse_domain(option, len, &lease->hostname);
if (r < 0) {
log_debug_errno(r, "Failed to parse hostname, ignoring: %m");
@@ -1028,7 +1028,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
break;
case SD_DHCP_OPTION_FQDN:
r = lease_parse_fqdn(option, len, &lease->hostname);
r = lease_parse_fqdn(option, len, &lease->fqdn);
if (r < 0) {
log_debug_errno(r, "Failed to parse FQDN, ignoring: %m");
return 0;