From 459c7079bebe7059d90441a5014d948a92d2ee19 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Tue, 4 Jan 2022 20:11:31 +0100
Subject: firewall: zone-policy: T2199: T4130: Fixes for firewall, state-policy
 and zone-policy

---
 src/conf_mode/zone_policy.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/conf_mode/zone_policy.py')

diff --git a/src/conf_mode/zone_policy.py b/src/conf_mode/zone_policy.py
index 2535ea33b..d605e9639 100755
--- a/src/conf_mode/zone_policy.py
+++ b/src/conf_mode/zone_policy.py
@@ -152,7 +152,9 @@ def cleanup_commands():
                     continue
                 for expr in item['rule']['expr']:
                     target = dict_search_args(expr, 'jump', 'target')
-                    if target and target.startswith("VZONE"):
+                    if not target:
+                        continue
+                    if target.startswith("VZONE") or target.startswith("VYOS_STATE_POLICY"):
                         commands.append(f'delete rule {table} {chain} handle {handle}')
         for item in obj['nftables']:
             if 'chain' in item:
@@ -180,7 +182,7 @@ def generate(zone_policy):
 
 def apply(zone_policy):
     install_result = run(f'nft -f {nftables_conf}')
-    if install_result == 1:
+    if install_result != 0:
         raise ConfigError('Failed to apply zone-policy')
 
     return None
-- 
cgit v1.2.3