diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2015-01-12 13:08:11 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-01-12 17:44:17 +0000 |
| commit | e6beaaccceb01a3ce56cfa3edfc8ab0191d51bb1 (patch) | |
| tree | 11ad619eb5862a583faf225e8bb26248744c1661 /ipalib/plugins/migration.py | |
| parent | 727f8099af9ace4a7a8e4489b34aa2db440336b2 (diff) | |
| download | freeipa-e6beaaccceb01a3ce56cfa3edfc8ab0191d51bb1.tar.gz freeipa-e6beaaccceb01a3ce56cfa3edfc8ab0191d51bb1.tar.xz freeipa-e6beaaccceb01a3ce56cfa3edfc8ab0191d51bb1.zip | |
migrate-ds: fix compat plugin check
After ACI refactoring, admin cannot read Schema Compatibility plugin configuration and therefore migrade-ds won't find if compat plugin is enabled.
Now the check si done by looking if cn=compat subtree is present.
https://fedorahosted.org/freeipa/ticket/4825
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipalib/plugins/migration.py')
| -rw-r--r-- | ipalib/plugins/migration.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index fa3d512bf..cd1fa73f8 100644 --- a/ipalib/plugins/migration.py +++ b/ipalib/plugins/migration.py @@ -140,7 +140,6 @@ _dn_err_msg = _('Malformed DN') _supported_schemas = (u'RFC2307bis', u'RFC2307') -_compat_dn = DN(('cn', 'Schema Compatibility'), ('cn', 'plugins'), ('cn', 'config')) def _pre_migrate_user(ldap, pkey, dn, entry_attrs, failed, config, ctx, **kwargs): assert isinstance(dn, DN) @@ -879,10 +878,8 @@ can use their Kerberos accounts.''') #check whether the compat plugin is enabled if not options.get('compat'): try: - check_compat = ldap.get_entry(_compat_dn) - if check_compat is not None and \ - check_compat.get('nsslapd-pluginenabled', [''])[0].lower() == 'on': - return dict(result={}, failed={}, enabled=True, compat=False) + ldap.get_entry(DN(('cn', 'compat'), (api.env.basedn))) + return dict(result={}, failed={}, enabled=True, compat=False) except errors.NotFound: pass |