diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-04-08 11:32:21 +0000 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-04-16 06:58:31 +0000 |
| commit | 8dca1cbd53f3af22ba81f0be7a2d80f004ce9d66 (patch) | |
| tree | efbefebca4f0670658330013d5f191cba39540e0 /ipaserver | |
| parent | e1f7bcfbea13f4fa67222d009092c556b017fcd4 (diff) | |
| download | freeipa-8dca1cbd53f3af22ba81f0be7a2d80f004ce9d66.tar.gz freeipa-8dca1cbd53f3af22ba81f0be7a2d80f004ce9d66.tar.xz freeipa-8dca1cbd53f3af22ba81f0be7a2d80f004ce9d66.zip | |
cainstance: Use LDAPClient instead of IPASimpleLDAPObject
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/cainstance.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 8ba6e4616..59a6b5f21 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -1643,13 +1643,14 @@ def replica_ca_install_check(config): objectclass = 'ipaObject' root_logger.debug('Checking if IPA schema is present in %s', ca_ldap_url) try: - connection = ldap2.IPASimpleLDAPObject( - ca_ldap_url, force_schema_updates=False) - connection.start_tls_s() - connection.simple_bind_s(DN(('cn', 'Directory Manager')), - config.dirman_password) - rschema = connection.schema - result = rschema.get_obj(ldap.schema.models.ObjectClass, objectclass) + with ipaldap.LDAPClient(ca_ldap_url, + start_tls=True, + force_schema_updates=False) as connection: + connection.simple_bind(DN(('cn', 'Directory Manager')), + config.dirman_password) + rschema = connection.schema + result = rschema.get_obj(ldap.schema.models.ObjectClass, + objectclass) except Exception: root_logger.critical( 'CA DS schema check failed. Make sure the PKI service on the ' |