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

networkd: tunnel ignore wrong conf rather than assert

Browse source 
Closes #9234
This commit is contained in:
Susant Sahani 2018-06-08 18:02:21 +05:30 committed by Zbigniew Jędrzejewski-Szmek
parent df560cf6b1
commit 194c03c839
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/network/netdev/tunnel.c
View file

@ -401,10 +401,10 @@ static int netdev_tunnel_verify(NetDev *netdev, const char *filename) {
return -EINVAL;
}
if (netdev->kind == NETDEV_KIND_VTI &&
if (IN_SET(netdev->kind, NETDEV_KIND_VTI, NETDEV_KIND_IPIP, NETDEV_KIND_GRE, NETDEV_KIND_GRETAP) &&
(t->family != AF_INET || in_addr_is_null(t->family, &t->local))) {
log_netdev_error(netdev,
"vti tunnel without a local IPv4 address configured in %s. Ignoring", filename);
"vti/ipip/gre/gretap tunnel without a local IPv4 address configured in %s. Ignoring", filename);
return -EINVAL;
}