From 673b775ef4d08fae36ee4f4fe0fecaf925c415d0 Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Sun, 21 Sep 2014 19:39:26 +0200 Subject: [PATCH] auth.py: fix crash si chambre Inconnue --- freeradius/auth.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/freeradius/auth.py b/freeradius/auth.py index d88146dd..b2777508 100644 --- a/freeradius/auth.py +++ b/freeradius/auth.py @@ -339,10 +339,13 @@ def decide_vlan(data, is_wifi, conn): else: decision = 'adherent', u'' prise, chbre = get_prise_chbre(data) - port = "%s/%s" % (prise, chbre) + port = "%s/%s" % (prise, chbre or 'Inconnue') - chbre = escape_ldap(chbre) - hebergeurs = conn.search(u'(&(chbre=%s)(|(cid=*)(aid=*)))' % chbre) + if 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 items = get_machines(data, is_wifi=is_wifi, proprio=(hebergeurs+[None])[0])