From 393d27f903fae7931f18181cf525ede212fb1457 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Thu, 18 Apr 2013 23:59:56 +0200 Subject: [PATCH] =?UTF-8?q?[firewall4]=20Pour=20la=20mise=20=C3=A0=20jour?= =?UTF-8?q?=20d'une=20mac,=20il=20faut=20d'abord=20supprimer=20l'ip,mac=20?= =?UTF-8?q?de=20l'ipset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestion/gen_confs/firewall4.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gestion/gen_confs/firewall4.py b/gestion/gen_confs/firewall4.py index baa5cd33..e88945ba 100755 --- a/gestion/gen_confs/firewall4.py +++ b/gestion/gen_confs/firewall4.py @@ -406,8 +406,9 @@ class firewall_base(object) : for ip in ip_list: machine = conn.search("ipHostNumber=%s" % ip) if machine: - try: self.test_mac_ip_dispatch(lambda set, data: self.ipset['mac_ip'][set].add(data), machine[0]) + try: self.test_mac_ip_dispatch(lambda set, data: self.ipset['mac_ip'][set].delete(data.split(',',1)[0]), {'ipHostNumber' : [ip], 'macAddress':[''] }) except IpsetError: pass + self.test_mac_ip_dispatch(lambda set, data: self.ipset['mac_ip'][set].add(data), machine[0]) else: try: self.test_mac_ip_dispatch(lambda set, data: self.ipset['mac_ip'][set].delete(data.split(',',1)[0]), {'ipHostNumber' : [ip], 'macAddress':[''] }) except IpsetError: pass