crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

freeradius/auth.py: ne manipule pas chbre si None

Browse source
This commit is contained in:
Daniel STAN 2014-10-28 22:47:19 +01:00
parent af01e94aef
commit 1487a4a957
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
freeradius/auth.py
View file

@ -386,13 +386,16 @@ def decide_vlan(data, is_wifi, conn):
# prise d'un autre adhérent à jour de cotisation
force_ma = False
is_ma = bool(proprio.get('droits', False))
if chbre is None and not is_ma:
if chbre is None:
if is_ma:
force_ma = True
else:
decision = "accueil", u"Chambre inconnue"
elif 'cl' in chbre:
# Pour les locaux clubs, il n'y a pas forcément un club sédentaire
# (typiquement, les locaux sous digicode)
decision = decision[0], decision[1] + u' (local club)'
elif chbre is not None:
else:
for hebergeur in hebergeurs:
# Si on est hébergé par un adhérent ok, ou que c'est notre
# chambre, pas de problème
@ -405,8 +408,7 @@ def decide_vlan(data, is_wifi, conn):
force_ma = True
else:
decision = "accueil", u"Hébergeur blacklisté"
else:
force_ma = True
if force_ma:
decision = decision[0], decision[1] + u' (force MA)'