diff options
| author | Tomas Krizek <tkrizek@redhat.com> | 2016-11-01 14:52:33 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-07 11:34:03 +0100 |
| commit | 5b81dbfda1e4f0799d4ce87e9987a896af3ff299 (patch) | |
| tree | bf0b256dec17a5e9ca7bacb414488cb0436aba49 /ipaserver/install/bindinstance.py | |
| parent | 4f1a6a177666c475156f496d3f7719b37e66a7b0 (diff) | |
| download | freeipa-5b81dbfda1e4f0799d4ce87e9987a896af3ff299.tar.gz freeipa-5b81dbfda1e4f0799d4ce87e9987a896af3ff299.tar.xz freeipa-5b81dbfda1e4f0799d4ce87e9987a896af3ff299.zip | |
ipaldap: merge IPAdmin to LDAPClient
* move IPAdmin methods to LDAPClient
* add extra arguments (cacert, sasl_nocanon) to LDAPClient.__init__()
* add host, port, _protocol to LDAPClient (parsed from ldap_uri)
* create get_ldap_uri() method to create ldap_uri from former
IPAdmin.__init__() arguments
* replace IPAdmin with LDAPClient + get_ldap_uri()
* remove ununsed function argument hostname from
enable_replication_version_checking()
https://fedorahosted.org/freeipa/ticket/6461
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver/install/bindinstance.py')
| -rw-r--r-- | ipaserver/install/bindinstance.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 350cb3c76..65fc462c7 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -237,11 +237,9 @@ def dns_container_exists(fqdn, suffix, dm_password=None, ldapi=False, realm=None try: # At install time we may need to use LDAPI to avoid chicken/egg # issues with SSL certs and truting CAs - if ldapi: - conn = ipaldap.IPAdmin(host=fqdn, ldapi=True, realm=realm) - else: - conn = ipaldap.IPAdmin(host=fqdn, port=636, cacert=CACERT) - + ldap_uri = ipaldap.get_ldap_uri(fqdn, 636, ldapi=ldapi, realm=realm, + cacert=CACERT) + conn = ipaldap.LDAPClient(ldap_uri, cacert=CACERT) conn.do_bind(dm_password, autobind=autobind) except ldap.SERVER_DOWN: raise RuntimeError('LDAP server on %s is not responding. Is IPA installed?' % fqdn) |