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 /client/ipa-client-install | |
| 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 'client/ipa-client-install')
| -rwxr-xr-x | client/ipa-client-install | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/ipa-client-install b/client/ipa-client-install index 625eaf3a1..639810b62 100755 --- a/client/ipa-client-install +++ b/client/ipa-client-install @@ -1877,7 +1877,8 @@ def print_port_conf_info(): " UDP: 464, 123 (if NTP enabled)") def get_certs_from_ldap(server, base_dn, realm, ca_enabled): - conn = ipaldap.IPAdmin(server, sasl_nocanon=True) + ldap_uri = ipaldap.get_ldap_uri(server) + conn = ipaldap.LDAPClient(ldap_uri, sasl_nocanon=True) try: conn.gssapi_bind() certs = certstore.get_ca_certs(conn, base_dn, realm, ca_enabled) |