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

conf: Don't get IPv{4,6} DNS addresses if IPv{4,6} is disabled

Browse source 
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2021-10-10 01:13:37 +02:00
parent 580581fd96
commit dcd3605d14
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
conf.c
View file

@ -574,8 +574,8 @@ static void get_dns(struct ctx *c)
char buf[BUFSIZ], *p, *end; char buf[BUFSIZ], *p, *end;
FILE *r; FILE *r;
dns4_set = !!*dns4; dns4_set = !c->v4 || !!*dns4;
dns6_set = !IN6_IS_ADDR_UNSPECIFIED(dns6); dns6_set = !c->v6 || !IN6_IS_ADDR_UNSPECIFIED(dns6);
dnss_set = !!*s->n || c->no_dns_search; dnss_set = !!*s->n || c->no_dns_search;
dns_set = dns4_set || dns6_set || c->no_dns; dns_set = dns4_set || dns6_set || c->no_dns;
@ -596,13 +596,15 @@ static void get_dns(struct ctx *c)
if (end) if (end)
*end = 0; *end = 0;
if (dns4 - &c->dns4[0] < ARRAY_SIZE(c->dns4) - 1 && if (!dns4_set &&
dns4 - &c->dns4[0] < ARRAY_SIZE(c->dns4) - 1 &&
inet_pton(AF_INET, p + 1, dns4)) { inet_pton(AF_INET, p + 1, dns4)) {
dns4++; dns4++;
*dns4 = 0; *dns4 = 0;
} }
if (dns6 - &c->dns6[0] < ARRAY_SIZE(c->dns6) - 1 && if (!dns6_set &&
dns6 - &c->dns6[0] < ARRAY_SIZE(c->dns6) - 1 &&
inet_pton(AF_INET6, p + 1, dns6)) { inet_pton(AF_INET6, p + 1, dns6)) {
dns6++; dns6++;
memset(dns6, 0, sizeof(*dns6)); memset(dns6, 0, sizeof(*dns6));