Blame SOURCES/0007-nftables-fix-ipv6-rich-rule-forward-ports.patch

c8bceb
From 44fc2d750bc0382d5de6ff5f6711f247b6f10847 Mon Sep 17 00:00:00 2001
c8bceb
From: Eric Garver <e@erig.me>
c8bceb
Date: Wed, 5 Dec 2018 19:11:06 -0500
c8bceb
Subject: [PATCH 07/23] nftables: fix ipv6 rich rule forward-ports
c8bceb
c8bceb
The were mistakenly being added to the ipv4 nat tables as well.
c8bceb
c8bceb
Fixes: #422
c8bceb
Fixes: b630abd8e901 ("backend: introduce nftables support")
c8bceb
(cherry picked from commit 628657cdafa7ba3217fb031c748f5a7d32924c90)
c8bceb
---
c8bceb
 src/firewall/core/nftables.py | 2 +-
c8bceb
 1 file changed, 1 insertion(+), 1 deletion(-)
c8bceb
c8bceb
diff --git a/src/firewall/core/nftables.py b/src/firewall/core/nftables.py
c8bceb
index 00a02ad149e5..a1cb2c474737 100644
c8bceb
--- a/src/firewall/core/nftables.py
c8bceb
+++ b/src/firewall/core/nftables.py
c8bceb
@@ -980,7 +980,7 @@ class nftables(object):
c8bceb
            or toaddr and check_single_address("ipv6", toaddr)):
c8bceb
             rules.extend(self._build_zone_forward_port_nat_rules(enable, zone,
c8bceb
                                 protocol, mark_fragment, toaddr, toport, "ip6"))
c8bceb
-        if rich_rule and (rich_rule.family and rich_rule.family == "ipv4"
c8bceb
+        elif rich_rule and (rich_rule.family and rich_rule.family == "ipv4"
c8bceb
            or toaddr and check_single_address("ipv4", toaddr)):
c8bceb
             rules.extend(self._build_zone_forward_port_nat_rules(enable, zone,
c8bceb
                                 protocol, mark_fragment, toaddr, toport, "ip"))
c8bceb
-- 
c8bceb
2.20.1
c8bceb