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

[lc_ldap] Putain de merge conflict à la con que j'ai mal résolu.

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2013-05-30 01:36:56 +02:00
parent cd75ed7bd4
commit 48c8e7d603
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lc_ldap.py
View file

@ -234,7 +234,7 @@ class lc_ldap(ldap.ldapobject.LDAPObject, object):
assert isinstance(owner, objets.AssociationCrans) assert isinstance(owner, objets.AssociationCrans)
elif realm in ["wifi-adh", "wifi-v6"]: elif realm in ["wifi-adh", "wifi-v6"]:
ldif['objectClass'] = [u'machineWifi'] uldif['objectClass'] = [u'machineWifi']
assert isinstance(owner, objets.adherent) or isinstance(owner, objets.club) assert isinstance(owner, objets.adherent) or isinstance(owner, objets.club)
elif realm in ["adherents", "adherents-v6", "personnel-ens"]: elif realm in ["adherents", "adherents-v6", "personnel-ens"]: