From 3054c6390a485451c83580e4cfeab4d90c08d95d Mon Sep 17 00:00:00 2001

From: Eric Garver <eric@garver.life>

Date: Thu, 25 Apr 2019 15:08:28 -0400

Subject: [PATCH 34/73] fix: on reload, set policy before cleanup

Otherwise cleanup() will wipe out things that may be important when

setting the policy, e.g. IndividualCalls.

(cherry picked from commit fd2e86fb4a508e750ad4fabc3a5be83e56338e2d)

(cherry picked from commit 99d0122d1a37b8744faeef619611bd7f9637e974)

---

 src/firewall/core/fw.py | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/firewall/core/fw.py b/src/firewall/core/fw.py

index abb25f0c3e72..876c43392b1b 100644

--- a/src/firewall/core/fw.py

+++ b/src/firewall/core/fw.py

@@ -966,11 +966,11 @@ class Firewall(object):

         _direct_config = self.direct.get_runtime_config()

         _old_dz = self.get_default_zone()

+        self.set_policy("DROP")

+

         # stop

         self.cleanup()

-        self.set_policy("DROP")

-

         start_exception = None

         try:

             self._start(reload=True, complete_reload=stop)

-- 

2.20.1