mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conf: More accurately count entries added in get_dns()

Browse source 
get_dns() counts the number of guest DNS servers it adds, and gives an
error if it couldn't add any.  However, this count ignores the fact that
add_dns[46]() may in some cases *not* add an entry.  Use the array indices
we're already tracking to get an accurate count.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2024-08-21 14:20:02 +10:00 committed by Stefano Brivio
parent c679894668
commit 6852bd07cc
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
conf.c
View file

@ -427,7 +427,6 @@ static void get_dns(struct ctx *c)
struct lineread resolvconf; struct lineread resolvconf;
struct in6_addr dns6_tmp; struct in6_addr dns6_tmp;
struct in_addr dns4_tmp; struct in_addr dns4_tmp;
unsigned int added = 0;
ssize_t line_len; ssize_t line_len;
char *line, *end; char *line, *end;
const char *p; const char *p;
@ -455,16 +454,12 @@ static void get_dns(struct ctx *c)
*end = 0; *end = 0;
if (!dns4_set && dns4_idx < ARRAY_SIZE(c->ip4.dns) - 1 if (!dns4_set && dns4_idx < ARRAY_SIZE(c->ip4.dns) - 1
&& inet_pton(AF_INET, p + 1, &dns4_tmp)) { && inet_pton(AF_INET, p + 1, &dns4_tmp))
dns4_idx += add_dns4(c, &dns4_tmp, dns4_idx); dns4_idx += add_dns4(c, &dns4_tmp, dns4_idx);
added++;
}
if (!dns6_set && dns6_idx < ARRAY_SIZE(c->ip6.dns) - 1 if (!dns6_set && dns6_idx < ARRAY_SIZE(c->ip6.dns) - 1
&& inet_pton(AF_INET6, p + 1, &dns6_tmp)) { && inet_pton(AF_INET6, p + 1, &dns6_tmp))
dns6_idx += add_dns6(c, &dns6_tmp, dns6_idx); dns6_idx += add_dns6(c, &dns6_tmp, dns6_idx);
added++;
}
} else if (!dnss_set && strstr(line, "search ") == line && } else if (!dnss_set && strstr(line, "search ") == line &&
s == c->dns_search) { s == c->dns_search) {
end = strpbrk(line, "\n"); end = strpbrk(line, "\n");
@ -491,7 +486,7 @@ static void get_dns(struct ctx *c)
out: out:
if (!dns_set) { if (!dns_set) {
if (!added) if (!(dns4_idx + dns6_idx))
warn("Couldn't get any nameserver address"); warn("Couldn't get any nameserver address");
if (c->no_dhcp_dns) if (c->no_dhcp_dns)