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

[lc_ldap] Correction de bug dû aux rid spéciaux...

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2013-03-04 05:16:40 +01:00
parent 50f5aabb45
commit 0d0d9d9676
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crans_utils.py
View file

@ -93,7 +93,10 @@ def ip6_of_mac(mac, rid):
euid64v6 = hex(int(mac[:2], 16)^0b00000010) + mac[2:6] + 'fffe' + mac[6:12] euid64v6 = hex(int(mac[:2], 16)^0b00000010) + mac[2:6] + 'fffe' + mac[6:12]
# fil-v6 ou wifi-v6, we don't care # fil-v6 ou wifi-v6, we don't care
return netaddr.IPAddress(netaddr.IPNetwork(config.prefix[net][0]).first + int(euid64v6, 16)) if net != "special":
return netaddr.IPAddress(netaddr.IPNetwork(config.prefix[net][0]).first + int(euid64v6, 16))
else:
return config.ipv6_machines_speciales[rid]
def strip_accents(a): def strip_accents(a):
""" Supression des accents de la chaîne fournie""" """ Supression des accents de la chaîne fournie"""

2
lc_ldap.py
View file

@ -819,7 +819,7 @@ class AssociationCrans(proprio):
class adherent(proprio): class adherent(proprio):
u"""Adhérent crans.""" u"""Adhérent crans."""
ufields = proprio.ufields + ['aid', 'prenom', 'tel', 'mail', 'mailInvalide'] ufields = proprio.ufields + ['aid', 'prenom', 'tel', 'mail', 'mailInvalide', 'uid']
ofields = proprio.ofields + ['charteMA', ofields = proprio.ofields + ['charteMA',
'canonicalAlias', 'solde', 'contourneGreylist', 'canonicalAlias', 'solde', 'contourneGreylist',
'rewriteMailHeaders', 'derniereConnexion', 'rewriteMailHeaders', 'derniereConnexion',