From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 20 Feb 2019 01:17:11 +0000 (+0900)
Subject: network: disable LinkLocalAddressing= and IPv6AcceptRA= on bridge slaves by default
X-Git-Tag: v242-rc1~248^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f1918016f762bafdb6178b99faa655c599c51f1;p=thirdparty%2Fsystemd.git

network: disable LinkLocalAddressing= and IPv6AcceptRA= on bridge slaves by default

If they are not explicitly configured, then let's disable these
functionality on bridge slaves.
---

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index a83df49038a..dff542e1940 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -141,7 +141,10 @@ static int network_verify(Network *network) {
         }
 
         if (network->link_local < 0)
-                network->link_local = ADDRESS_FAMILY_IPV6;
+                network->link_local = network->bridge ? ADDRESS_FAMILY_NO : ADDRESS_FAMILY_IPV6;
+
+        if (network->ipv6_accept_ra < 0 && network->bridge)
+                network->ipv6_accept_ra = false;
 
         /* IPMasquerade=yes implies IPForward=yes */
         if (network->ip_masquerade)