From 3e458b2dec3be4d0ff3b23fea49171907ab73d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Tue, 22 Jan 2013 01:27:08 +0100 Subject: [PATCH] =?UTF-8?q?Cr=C3=A9ation=20de=20machine=20tenant=20compte?= =?UTF-8?q?=20de=20v6-only.=20On=20h=C3=A9site=20encore=20=C3=A0=20faire?= =?UTF-8?q?=20enregistrer=20les=20ipv6=20et=20pr=C3=A9fixes=20v6=20dans=20?= =?UTF-8?q?la=20base=20ldap,=20ou=20les=20recalculer=20=C3=A0=20chaque=20f?= =?UTF-8?q?ois.=20Chaque=20m=C3=A9thode=20semble=20avoir=20des=20avantages?= =?UTF-8?q?,=20inscrire=20les=20ipv6=20dans=20la=20base=20obligerait=20?= =?UTF-8?q?=C3=A0=20faire=20une=20grosse=20modif=20en=20cas=20de=20changem?= =?UTF-8?q?ent=20de=20routeur/pr=C3=A9fixe,=20ne=20pas=20les=20mettre=20pr?= =?UTF-8?q?ive=20le=20binding=20de=20la=20possibilit=C3=A9=20d'ajouter=20d?= =?UTF-8?q?es=20ipv6=20en=20plus=20=C3=A0=20certaines=20machines.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lc_ldap.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lc_ldap.py b/lc_ldap.py index ba905a0..0be5d13 100644 --- a/lc_ldap.py +++ b/lc_ldap.py @@ -228,7 +228,7 @@ class lc_ldap(ldap.ldapobject.LDAPObject): assert isinstance(owner, adherent) or isinstance(owner, club) # XXX - Vérifier les droits (owner.type_connexion) - elif realm in ["fil", "fil-v6", "gratuit", "personnel-ens"]: + elif realm in ["fil", "fil-v6", "personnel-ens"]: uldif['objectClass'] = [u'machineFixe'] assert isinstance(owner, adherent) or isinstance(owner, club) @@ -239,7 +239,8 @@ class lc_ldap(ldap.ldapobject.LDAPObject): # On récupère le premier id libre dans la plages s'il n'est pas # déjà précisé dans le ldiff mid = uldif.setdefault('mid', [ unicode(self._find_id('mid', plage)) ]) - uldif['ipHostNumber'] = [ unicode(crans_utils.ip4_of_mid(int (mid[0]))) ] + if 'v6' not in realm: + uldif['ipHostNumber'] = [ unicode(crans_utils.ip4_of_mid(int (mid[0]))) ] return self._create_entity('mid=%s,%s' % (mid[0], parent), uldif) def newAdherent(self, uldif):