Support attributes with multiple names in LDAPEntry.

This commit is contained in:
Jan Cholasta
2013-01-31 11:57:02 +01:00
committed by Martin Kosek
parent f17aa00ff0
commit 3aa39547df
3 changed files with 20 additions and 4 deletions

View File

@@ -412,7 +412,6 @@ class host_add(LDAPCreate):
util.validate_host_dns(self.log, keys[-1])
if 'locality' in entry_attrs:
entry_attrs['l'] = entry_attrs['locality']
del entry_attrs['locality']
entry_attrs['cn'] = keys[-1]
entry_attrs['serverhostname'] = keys[-1].split('.', 1)[0]
if 'userpassword' not in entry_attrs and not options.get('random', False):
@@ -635,7 +634,6 @@ class host_mod(LDAPUpdate):
raise errors.ACIError(info=_('cn is immutable'))
if 'locality' in entry_attrs:
entry_attrs['l'] = entry_attrs['locality']
del entry_attrs['locality']
if 'krbprincipalname' in entry_attrs:
(dn, entry_attrs_old) = ldap.get_entry(
dn, ['objectclass', 'krbprincipalname']