From: Susant Sahani <susant@redhat.com>
Date: Fri, 8 Jun 2018 12:32:21 +0000 (+0530)
Subject: networkd: tunnel ignore wrong conf rather than assert
X-Git-Tag: v239~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=194c03c839b23261d005d3b3a8ab197be53492a7;p=thirdparty%2Fsystemd.git

networkd: tunnel ignore wrong conf rather than assert

Closes #9234
---

diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
index 496407ef223..2589ea13f47 100644
--- a/src/network/netdev/tunnel.c
+++ b/src/network/netdev/tunnel.c
@@ -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;
         }