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

networkd: Ignore DNS information when uplink is not managed (#7571)

Browse source 
When another networking daemon or configuration is handling the
uplink connection, systemd-networkd won't have a network configuration
associated with the link, and therefore link->network will be NULL.
An assert will be triggered later on in the code when link->network is
NULL.
This commit is contained in:
Patrik Flykt 2017-12-08 14:33:40 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 9e32914aa5
commit 349a981d32
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/network/networkd-radv.c
View file

@ -92,6 +92,11 @@ static int radv_set_dns(Link *link, Link *uplink) {
goto set_dns;
if (uplink) {
if (uplink->network == NULL) {
log_link_debug(uplink, "Cannot fetch DNS servers as uplink interface is not managed by us");
return 0;
}
r = radv_get_ip6dns(uplink->network, &dns, &n_dns);
if (r > 0)
goto set_dns;
@ -125,6 +130,11 @@ static int radv_set_domains(Link *link, Link *uplink) {
goto set_domains;
if (uplink) {
if (uplink->network == NULL) {
log_link_debug(uplink, "Cannot fetch DNS search domains as uplink interface is not managed by us");
return 0;
}
search_domains = uplink->network->search_domains;
if (search_domains)
goto set_domains;