networkd: make IP forwarding for IPv4 and IPv6 individually configurable

[elogind.git] / src / network / networkd-network.c

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 98f199ad7281af3c26d67cdbeb2f78ea56a63e34..34a06d3f34e7c125f79b098b9dabcf7ae87a5938 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -111,7 +111,7 @@ static int network_load_one(Manager *manager, const char *filename) {
 
         /* IPMasquerade=yes implies IPForward=yes */
         if (network->ip_masquerade)
 
         /* IPMasquerade=yes implies IPForward=yes */
         if (network->ip_masquerade)

-                network->ip_forward = true;
+                network->ip_forward |= ADDRESS_FAMILY_IPV4;

 
         LIST_PREPEND(networks, manager->networks, network);
 
 
         LIST_PREPEND(networks, manager->networks, network);
 


@@ -489,6 +489,10 @@ int config_parse_dhcp(
         assert(rvalue);
         assert(data);
 
         assert(rvalue);
         assert(data);
 

+        /* Note that this is mostly like
+         * config_parse_address_family_boolean(), except that it
+         * understands some old names for the enum values */
+

         s = address_family_boolean_from_string(rvalue);
         if (s < 0) {
 
         s = address_family_boolean_from_string(rvalue);
         if (s < 0) {