diff options
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/cainstance.py | 5 | ||||
| -rw-r--r-- | ipaserver/install/plugins/rename_managed.py | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 25647987..a1107cee 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -1915,12 +1915,11 @@ def update_people_entry(uid, dercert): conn = ldap2.ldap2(shared_instance=False, ldap_uri=dogtag_uri) conn.connect(bind_dn=DN(('cn', 'directory manager')), bind_pw=dm_password) - (entry_dn, entry_attrs) = conn.get_entry(dn, ['usercertificate'], - normalize=False) + (entry_dn, entry_attrs) = conn.get_entry(dn, ['usercertificate']) entry_attrs['usercertificate'].append(dercert) entry_attrs['description'] = '2;%d;%s;%s' % (serial_number, issuer, subject) - conn.update_entry(dn, entry_attrs, normalize=False) + conn.update_entry(dn, entry_attrs) updated = True break except errors.NetworkError: diff --git a/ipaserver/install/plugins/rename_managed.py b/ipaserver/install/plugins/rename_managed.py index 206e0a0d..e0fa36bb 100644 --- a/ipaserver/install/plugins/rename_managed.py +++ b/ipaserver/install/plugins/rename_managed.py @@ -67,7 +67,7 @@ class GenerateUpdateMixin(object): try: definitions_managed_entries, truncated = ldap.find_entries( searchfilter, ['*'], old_definition_container, - ldap.SCOPE_ONELEVEL, normalize=False) + ldap.SCOPE_ONELEVEL) except errors.NotFound, e: return (False, update_list) @@ -77,7 +77,7 @@ class GenerateUpdateMixin(object): old_dn = entry.data['managedtemplate'][0] assert isinstance(old_dn, DN) try: - (old_dn, entry) = ldap.get_entry(old_dn, ['*'], normalize=False) + (old_dn, entry) = ldap.get_entry(old_dn, ['*']) except errors.NotFound, e: pass else: |