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

auth.py: fix crash si chambre Inconnue

Browse source
This commit is contained in:
Daniel STAN 2014-09-21 19:39:26 +02:00
parent 11a5c70b56
commit 673b775ef4
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
freeradius/auth.py
View file

@ -339,10 +339,13 @@ def decide_vlan(data, is_wifi, conn):
else: else:
decision = 'adherent', u'' decision = 'adherent', u''
prise, chbre = get_prise_chbre(data) prise, chbre = get_prise_chbre(data)
port = "%s/%s" % (prise, chbre) port = "%s/%s" % (prise, chbre or 'Inconnue')
chbre = escape_ldap(chbre) if chbre:
hebergeurs = conn.search(u'(&(chbre=%s)(|(cid=*)(aid=*)))' % chbre) chbre = escape_ldap(chbre)
hebergeurs = conn.search(u'(&(chbre=%s)(|(cid=*)(aid=*)))' % chbre)
else:
hebergeurs = []
# Prend la première machine candidat dans la base, ou exit # Prend la première machine candidat dans la base, ou exit
items = get_machines(data, is_wifi=is_wifi, proprio=(hebergeurs+[None])[0]) items = get_machines(data, is_wifi=is_wifi, proprio=(hebergeurs+[None])[0])