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

[lc_ldap/attributs] ns1.crans.ens-cachan.fr n'était pas un nom d'hôte valide.

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2013-05-05 05:41:36 +02:00
parent 5942ee143c
commit a7d3af3ca1
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
attributs.py
View file

@ -503,9 +503,8 @@ class dnsAttr(Attr):
category = 'dns'
def parse_value(self, val):
val = val.lower()
name, net = val.split('.', 1)
if (net not in ['adm.crans.org', 'crans.org', 'wifi.crans.org'] or
not re.match('[a-z][-_a-z0-9]+', name)):
name, _ = val.split('.', 1)
if not re.match('[a-z][-_a-z0-9]+', name):
raise ValueError("Nom d'hote invalide %r" % val)
self.value = val

4
lc_ldap.py
View file

@ -252,7 +252,7 @@ class lc_ldap(ldap.ldapobject.LDAPObject, object):
uldif['ipsec'] = [u''.join( random.choice(filter(lambda x: x != 'l' and x != 'o', string.lowercase) + filter(lambda x: x != '1' and x != '0', string.digits)) for i in range(10))]
assert isinstance(owner, adherent) or isinstance(owner, club)
elif realm in ["fil-adherents", "fil-v6", "personnel-ens"]:
elif realm in ["adherents", "fil-adherents", "fil-v6", "personnel-ens"]:
uldif['objectClass'] = [u'machineFixe']
assert isinstance(owner, adherent) or isinstance(owner, club)
@ -824,7 +824,7 @@ class proprio(CransLdapObject):
def machines(self):
"""Renvoie la liste des machines"""
if not self._machines:
self._machines = self.conn.search('mid=*', dn = self.dn, scope = 1)
self._machines = self.conn.search('mid=*', dn = self.dn, scope = 1, mode=self.mode)
for m in self._machines:
m._proprio = self
return self._machines