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 /install/tools/ipactl | |
| 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 'install/tools/ipactl')
| -rwxr-xr-x | install/tools/ipactl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install/tools/ipactl b/install/tools/ipactl index 354209310..13a1a272c 100755 --- a/install/tools/ipactl +++ b/install/tools/ipactl @@ -30,7 +30,7 @@ from ipaserver.install import service, installutils from ipaserver.install.dsinstance import config_dirname from ipaserver.install.installutils import is_ipa_configured, ScriptError from ipalib import api, errors -from ipapython.ipaldap import IPAdmin +from ipapython.ipaldap import LDAPClient from ipapython.ipautil import ( wait_for_open_ports, wait_for_open_socket, is_fips_enabled) from ipapython import config @@ -165,7 +165,7 @@ def get_config(dirsrv): else: (host, port) = lurl.hostport.split(':') wait_for_open_ports(host, [int(port)], timeout=api.env.startup_timeout) - con = IPAdmin(ldap_uri=api.env.ldap_uri) + con = LDAPClient(api.env.ldap_uri) con.external_bind() res = con.get_entries( base, |