]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: disable LinkLocalAddressing= and IPv6AcceptRA= on bridge slaves by default
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 20 Feb 2019 01:17:11 +0000 (10:17 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 25 Feb 2019 00:34:14 +0000 (09:34 +0900)
If they are not explicitly configured, then let's disable these
functionality on bridge slaves.

src/network/networkd-network.c

index a83df49038aa8f238594969cfcab27681636ac33..dff542e1940797ab6b933a576710ddd88c424a93 100644 (file)
@@ -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)