Browse Source

Fix des erreurs, et améliore la lisibilité des logs

dns_bux_fix
Gabriel Detraz 7 years ago
committed by root
parent
commit
ef2101e0c5
  1. 2
      freeradius_utils/auth.py
  2. 2
      freeradius_utils/freeradius3/mods-enabled/python
  3. 2
      topologie/models.py

2
freeradius_utils/auth.py

@ -348,7 +348,7 @@ def decide_vlan_and_register_switch(nas_machine, nas_type, port_number,
if not nas_machine: if not nas_machine:
return ('?', u'Chambre inconnue', u'Nas inconnu', VLAN_OK) return ('?', u'Chambre inconnue', u'Nas inconnu', VLAN_OK)
sw_name = str(nas_machine) sw_name = str(getattr(nas_machine, 'short_name', str(nas_machine)))
port = (Port.objects port = (Port.objects
.filter( .filter(

2
freeradius_utils/freeradius3/mods-enabled/python

@ -9,7 +9,7 @@
python re2o { python re2o {
module = auth module = auth
python_path = /etc/freeradius/3.0:/usr/lib/python2.7/:/usr/lib/python2.7/dist-packages/:/usr/local/lib/python2.7/site-packages/:/usr/local/lib/python2.7/dist-packages/ python_path = /etc/freeradius/3.0:/usr/lib/python2.7:/usr/lib/python2.7/dist-packages:/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/lib-dynload:/usr/local/lib/python2.7/dist-packages
mod_instantiate = ${.module} mod_instantiate = ${.module}
func_instantiate = instantiate func_instantiate = instantiate

2
topologie/models.py

@ -427,7 +427,7 @@ class Port(AclMixin, RevMixin, models.Model):
:returns: the profile of self (port)""" :returns: the profile of self (port)"""
def profile_or_nothing(profile): def profile_or_nothing(profile):
port_profile = PortProfile.objects.filter( port_profile = PortProfile.objects.filter(
profile_default=profile).first() profil_default=profile).first()
if port_profile: if port_profile:
return port_profile return port_profile
else: else:

Loading…
Cancel
Save