shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-12 08:58:20 +03:00
Code

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-10 08:00:00 +00:00
parent 1bd76a6217
commit 0ff8f2a33a
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/resolve/resolved-etc-hosts.c
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;
}

15
test/units/testsuite-75.sh
View File

@ -160,10 +160,12 @@ ip link del hoge.foo
### SETUP ###
# Configure network
hostnamectl hostname ns1.unsigned.test
{
echo "10.0.0.1 ns1.unsigned.test"
echo "fd00:dead:beef:cafe::1 ns1.unsigned.test"
} >>/etc/hosts
cat >>/etc/hosts <<EOF
10.0.0.1 ns1.unsigned.test
fd00:dead:beef:cafe::1 ns1.unsigned.test
127.128.0.5 localhost5 localhost5.localdomain localhost5.localdomain4 localhost.localdomain5 localhost5.localdomain5
EOF
mkdir -p /etc/systemd/network
cat >/etc/systemd/network/dns0.netdev <<EOF
@ -293,6 +295,11 @@ run getent -s myhostname hosts localhost
grep -qE "^127\.0\.0\.1\s+localhost" "$RUN_OUT"
enable_ipv6
# Issue: https://github.com/systemd/systemd/issues/25088
run getent -s resolve hosts 127.128.0.5
grep -qEx '127\.128\.0\.5\s+localhost5(\s+localhost5?\.localdomain[45]?){4}' "$RUN_OUT"
[ "$(wc -l <"$RUN_OUT")" -eq 1 ]
: "--- Basic resolved tests ---"
# Issue: https://github.com/systemd/systemd/issues/22229
# PR: https://github.com/systemd/systemd/pull/22231