diff options
| author | David Kupka <dkupka@redhat.com> | 2014-11-19 09:57:59 -0500 |
|---|---|---|
| committer | Petr Viktorin <pviktori@dhcp-31-13.brq.redhat.com> | 2014-11-20 16:49:13 +0100 |
| commit | 35dad9684b22819a2c848e7ebb78cfbc438a30e6 (patch) | |
| tree | 2955c432c9ac514d4a9a96e5d0909d4674a50cc0 /ipalib/plugins/migration.py | |
| parent | 58737c7791b44d9d7cd011d3385bf66ea24d9830 (diff) | |
| download | freeipa-35dad9684b22819a2c848e7ebb78cfbc438a30e6.tar.gz freeipa-35dad9684b22819a2c848e7ebb78cfbc438a30e6.tar.xz freeipa-35dad9684b22819a2c848e7ebb78cfbc438a30e6.zip | |
Fix --{user,group}-ignore-attribute in migration plugin.
Ignore case in attribute names.
https://fedorahosted.org/freeipa/ticket/4620
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipalib/plugins/migration.py')
| -rw-r--r-- | ipalib/plugins/migration.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index 6b630a464..fa3d512bf 100644 --- a/ipalib/plugins/migration.py +++ b/ipalib/plugins/migration.py @@ -196,9 +196,8 @@ def _pre_migrate_user(ldap, pkey, dn, entry_attrs, failed, config, ctx, **kwargs entry_attrs.setdefault('loginshell', default_shell) # do not migrate all attributes - for attr in entry_attrs.keys(): - if attr in attr_blacklist: - del entry_attrs[attr] + for attr in attr_blacklist: + entry_attrs.pop(attr, None) # do not migrate all object classes if 'objectclass' in entry_attrs: @@ -393,9 +392,8 @@ def _pre_migrate_group(ldap, pkey, dn, entry_attrs, failed, config, ctx, **kwarg raise ValueError('Schema %s not supported' % schema) # do not migrate all attributes - for attr in entry_attrs.keys(): - if attr in attr_blacklist: - del entry_attrs[attr] + for attr in attr_blacklist: + entry_attrs.pop(attr, None) # do not migrate all object classes if 'objectclass' in entry_attrs: |