diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-02-04 11:50:58 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:47 +0100 |
| commit | 61c0938c769f5ece202f04095138a5348f95aa18 (patch) | |
| tree | 6168745816d79a4e3b8cb652ff64cfc5dc0297f1 /ipalib/plugins/migration.py | |
| parent | 5b2e0e2ba5808d6300de1cac743c96db0607121c (diff) | |
| download | freeipa-61c0938c769f5ece202f04095138a5348f95aa18.tar.gz freeipa-61c0938c769f5ece202f04095138a5348f95aa18.tar.xz freeipa-61c0938c769f5ece202f04095138a5348f95aa18.zip | |
Remove support for DN normalization from LDAPClient.
Diffstat (limited to 'ipalib/plugins/migration.py')
| -rw-r--r-- | ipalib/plugins/migration.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index d94484331..7884e08cf 100644 --- a/ipalib/plugins/migration.py +++ b/ipalib/plugins/migration.py @@ -346,7 +346,6 @@ def _pre_migrate_group(ldap, pkey, dn, entry_attrs, failed, config, ctx, **kwarg api.log.error('entry %s does not belong into any known container' % m) continue - m = ldap.normalize_dn(m) new_members.append(m) del entry_attrs[member_attr] @@ -363,7 +362,7 @@ def _pre_migrate_group(ldap, pkey, dn, entry_attrs, failed, config, ctx, **kwarg for m in entry_attrs[member_attr]: memberdn = DN((api.Object.user.primary_key.name, m), api.env.container_user, api.env.basedn) - new_members.append(ldap.normalize_dn(memberdn)) + new_members.append(memberdn) entry_attrs['member'] = new_members assert isinstance(dn, DN) @@ -863,7 +862,7 @@ can use their Kerberos accounts.''') #check whether the compat plugin is enabled if not options.get('compat'): try: - (dn,check_compat) = ldap.get_entry(_compat_dn, normalize=False) + (dn,check_compat) = ldap.get_entry(_compat_dn) assert isinstance(dn, DN) if check_compat is not None and \ check_compat.get('nsslapd-pluginenabled', [''])[0].lower() == 'on': |