From 86e2012132a63ce568b984008913493b2d93a220 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Sat, 7 Sep 2013 18:54:05 +0200 Subject: [PATCH] [ipt] Pas de modification en place de la liste de blacklist de config.py --- gestion/ipt.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gestion/ipt.py b/gestion/ipt.py index 128cf470..eea46700 100644 --- a/gestion/ipt.py +++ b/gestion/ipt.py @@ -31,8 +31,9 @@ from ridtools import Rid, find_rid_plage import subprocess import netaddr -blacklist_sanctions.extend(blacklist_sanctions_soft) -blacklist_sanctions.extend(blacklist_bridage_upload) +blacklist_sanctions_ipv6 = list(blacklist_sanctions) +blacklist_sanctions_ipv6.extend(blacklist_sanctions_soft) +blacklist_sanctions_ipv6.extend(blacklist_bridage_upload) Mangle_policy = """ *mangle @@ -756,7 +757,7 @@ def blacklist(ipt): for target in s['adherent'] + s['club']: sanctions = target.blacklist_actif() - if [x for x in sanctions if x in blacklist_sanctions]: + if [x for x in sanctions if x in blacklist_sanctions_ipv6]: blcklst.extend(target.machines()) s = db.search('mblacklist=*&paiement=%s' % ann_scol) @@ -765,7 +766,7 @@ def blacklist(ipt): for target in s['machine']: sanctions = target.blacklist_actif() - if [x for x in sanctions if x in blacklist_sanctions]: + if [x for x in sanctions if x in blacklist_sanctions_ipv6]: blcklst.append(target) if ipt.filter.blacklist_src.items: