[PATCH 1/2] add_interface() called with wrong number of parameters

In firewall/core/fw_zone.py we define add_interface as add_interface(zone, interface, timeout=0, sender=None) but we call it in server/firewalld.py:addInterface() as zone.add_interface(zone, interface, sender) which means that we pass the sender value into the timeout parameter. I'm not sure how this is supposed to work so this patch is just a suggestion. --- src/firewall/core/fw_zone.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/firewall/core/fw_zone.py b/src/firewall/core/fw_zone.py index 89593dc..71d62d4 100644 --- a/src/firewall/core/fw_zone.py +++ b/src/firewall/core/fw_zone.py @@ -294,7 +294,7 @@ class FirewallZone: if not enable: self.remove_chain(zone, table, chain) - def add_interface(self, zone, interface, timeout=0, sender=None): + def add_interface(self, zone, interface, sender=None): self._fw.check_panic() _zone = self._fw.check_zone(zone) _obj = self._zones[_zone] @@ -310,7 +310,7 @@ class FirewallZone: _obj.interfaces.append(interface) _obj.settings["interfaces"][interface_id] = \ - self.__gen_settings(timeout, sender) + self.__gen_settings(0, sender) return _zone -- 1.7.7.6