crans -> AssociationCrans

adherent -> Adherent
club -> Club

darcs-hash:20060325215156-68412-615c1bfb3b23e16cd10b82cc3dc467e716c258ea.gz
This commit is contained in:
glondu 2006-03-25 22:51:56 +01:00
parent 0a53921e05
commit f16056b8b4
12 changed files with 62 additions and 64 deletions

View file

@ -28,8 +28,8 @@ sys.path.append('/usr/scripts/gestion')
import syslog
import pwd
from lock import *
from ldap_crans import crans_ldap, ann_scol, crans, hostname
from ldap_crans import Machine, MachineWifi
from ldap_crans import crans_ldap, ann_scol, hostname
from ldap_crans import AssociationCrans, Machine, MachineWifi
from affich_tools import *
from commands import getstatusoutput
from iptools import AddrInNet
@ -285,7 +285,7 @@ class firewall_crans :
serveur_maj = True
# Il faut avoir payé ou être une machine du crans
if db.search('paiement=ok&ip=%s'% ip)['machine'] or \
machine[0].proprietaire().__class__ == crans:
machine[0].proprietaire().__class__ == AssociationCrans:
mac_ip_maj[ip] = machine[0]
else :
mac_ip_maj[ip] = None