From 4564c6ece2398f6e125ccf9f08ed44cb5f048381 Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Sat, 1 Mar 2014 22:00:54 +0100 Subject: [PATCH] radius/auth.py: contexte pour modifier la mac --- freeradius/auth.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/freeradius/auth.py b/freeradius/auth.py index 1e39d449..39deccc5 100644 --- a/freeradius/auth.py +++ b/freeradius/auth.py @@ -135,7 +135,6 @@ def get_prise(auth_data): @use_ldap_admin def register_mac(auth_data, machine, conn): - machine = conn.search(unicode(machine.dn.split(',',1)[0]), mode='rw')[0] for (key, value) in auth_data: if key == 'Calling-Station-Id': try: @@ -144,9 +143,11 @@ def register_mac(auth_data, machine, conn): except: radiusd.radlog(radiusd.L_ERR, 'Cannot format MAC !') - if mac is not None: - mac = unicode(mac.lower()) - + if mac is None: + radiusd.radlog(radiusd.L_ERR, 'Cannot find MAC') + return + mac = unicode(mac.lower()) + with conn.search(unicode(machine.dn.split(',',1)[0]), mode='rw')[0] as machine: radiusd.radlog(radiusd.L_INFO, 'Registering mac %s' % mac) machine['macAddress'] = mac machine.history_add(u'auth.py', u'macAddress ( -> %s)' % mac) @@ -155,8 +156,6 @@ def register_mac(auth_data, machine, conn): radiusd.radlog(radiusd.L_INFO, 'Triggering komaz') trigger_generate('komaz') radiusd.radlog(radiusd.L_INFO, 'done ! (triggered komaz)') - else: - radiusd.radlog(radiusd.L_ERR, 'Cannot find MAC') @use_ldap_admin @use_ldap