picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-dhcp: chop of trailing dot of DHCP supplied host and domain nams

This commit is contained in:
Lennart Poettering 2015-01-28 17:47:37 +01:00
parent 3b48ce4ec4
commit f50f01f4b7
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,11 +497,20 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option,
case DHCP_OPTION_DOMAIN_NAME:
{
_cleanup_free_ char *domainname = NULL;
char *e;
r = lease_parse_string(option, len, &domainname);
if (r < 0)
return r;
/* Chop off trailing dot of domain name that some DHCP
* servers send us back. Internally we want to store
* host names without trailing dots and
* host_name_is_valid() doesn't accept them. */
e = endswith(domainname, ".");
if (e)
*e = 0;
if (!hostname_is_valid(domainname) || is_localhost(domainname))
break;
@ -514,11 +523,16 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option,
case DHCP_OPTION_HOST_NAME:
{
_cleanup_free_ char *hostname = NULL;
char *e;
r = lease_parse_string(option, len, &hostname);
if (r < 0)
return r;
e = endswith(hostname, ".");
if (e)
*e = 0;
if (!hostname_is_valid(hostname) || is_localhost(hostname))
break;