diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-02-04 09:47:00 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:47 +0100 |
| commit | a09c50671ecc53af63765afca13edd27ee598081 (patch) | |
| tree | 07f8c21e0be27b92dfe73ab505ea5bae63fd39cc /ipalib/plugins/migration.py | |
| parent | 3aa39547df18bc77ba49720f8a3a1a0052907859 (diff) | |
| download | freeipa-a09c50671ecc53af63765afca13edd27ee598081.tar.gz freeipa-a09c50671ecc53af63765afca13edd27ee598081.tar.xz freeipa-a09c50671ecc53af63765afca13edd27ee598081.zip | |
Use full DNs in plugin code.
Diffstat (limited to 'ipalib/plugins/migration.py')
| -rw-r--r-- | ipalib/plugins/migration.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index 7b6dc78bf..d94484331 100644 --- a/ipalib/plugins/migration.py +++ b/ipalib/plugins/migration.py @@ -336,10 +336,12 @@ def _pre_migrate_group(ldap, pkey, dn, entry_attrs, failed, config, ctx, **kwarg if m.endswith(search_bases['user']): api.log.info('migrating %s user %s' % (member_attr, m)) - m = DN((api.Object.user.primary_key.name, rdnval), api.env.container_user) + m = DN((api.Object.user.primary_key.name, rdnval), + api.env.container_user, api.env.basedn) elif m.endswith(search_bases['group']): api.log.info('migrating %s group %s' % (member_attr, m)) - m = DN((api.Object.group.primary_key.name, rdnval), api.env.container_group) + m = DN((api.Object.group.primary_key.name, rdnval), + api.env.container_group, api.env.basedn) else: api.log.error('entry %s does not belong into any known container' % m) continue @@ -359,7 +361,8 @@ def _pre_migrate_group(ldap, pkey, dn, entry_attrs, failed, config, ctx, **kwarg new_members = [] entry_attrs.setdefault(member_attr, []) for m in entry_attrs[member_attr]: - memberdn = DN((api.Object.user.primary_key.name, m), api.env.container_user) + memberdn = DN((api.Object.user.primary_key.name, m), + api.env.container_user, api.env.basedn) new_members.append(ldap.normalize_dn(memberdn)) entry_attrs['member'] = new_members |