SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved: fix the canonical name returned by hosts lookup by address

Browse Source 
In etc_hosts_lookup_by_address(), make sure the canonical name of the given
address is returned first in the list of names that address resolves to.

Resolves: #25088
This commit is contained in:
Dmitry V. Levin
2023-07-14 13:13:53 +00:00
parent 1bd76a6217
commit 0ff8f2a33a
2 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolved-etc-hosts.c
+23 -10
View File
@@ -381,6 +381,20 @@ static int manager_etc_hosts_read(Manager *m) {
return 1;
}
static int answer_add_ptr(DnsAnswer *answer, DnsResourceKey *key, const char *name) {
_cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL;
rr = dns_resource_record_new(key);
if (!rr)
return -ENOMEM;
rr->ptr.name = strdup(name);
if (!rr->ptr.name)
return -ENOMEM;
return dns_answer_add(answer, rr, 0, DNS_ANSWER_AUTHENTICATED, NULL);
}
static int etc_hosts_lookup_by_address(
EtcHosts *hosts,
DnsQuestion *q,
@@ -427,18 +441,17 @@ static int etc_hosts_lookup_by_address(
if (r < 0)
return r;
if (item->canonical_name) {
r = answer_add_ptr(*answer, found_ptr, item->canonical_name);
if (r < 0)
return r;
}
SET_FOREACH(n, item->names) {
_cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL;
if (n == item->canonical_name)
continue;
rr = dns_resource_record_new(found_ptr);
if (!rr)
return -ENOMEM;
rr->ptr.name = strdup(n);
if (!rr->ptr.name)
return -ENOMEM;
r = dns_answer_add(*answer, rr, 0, DNS_ANSWER_AUTHENTICATED, NULL);
r = answer_add_ptr(*answer, found_ptr, n);
if (r < 0)
return r;
}