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 /ipaclient | |
| 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 'ipaclient')
| -rw-r--r-- | ipaclient/ipa_certupdate.py | 3 | ||||
| -rw-r--r-- | ipaclient/ipadiscovery.py | 15 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ipaclient/ipa_certupdate.py b/ipaclient/ipa_certupdate.py index 0781f3936..3678decc2 100644 --- a/ipaclient/ipa_certupdate.py +++ b/ipaclient/ipa_certupdate.py @@ -56,7 +56,8 @@ class CertUpdate(admintool.AdminTool): api.finalize() server = urlsplit(api.env.jsonrpc_uri).hostname - ldap = ipaldap.IPAdmin(server) + ldap_uri = ipaldap.get_ldap_uri(server) + ldap = ipaldap.LDAPClient(ldap_uri) tmpdir = tempfile.mkdtemp(prefix="tmp-") ccache_name = os.path.join(tmpdir, 'ccache') diff --git a/ipaclient/ipadiscovery.py b/ipaclient/ipadiscovery.py index e546ab061..46e05c971 100644 --- a/ipaclient/ipadiscovery.py +++ b/ipaclient/ipadiscovery.py @@ -376,15 +376,14 @@ class IPADiscovery(object): #now verify the server is really an IPA server try: - root_logger.debug("Init LDAP connection to: %s", thost) + ldap_uri = ipaldap.get_ldap_uri(thost) + start_tls = False if ca_cert_path: - lh = ipaldap.IPAdmin(thost, protocol='ldap', - cacert=ca_cert_path, start_tls=True, - no_schema=True, decode_attrs=False, - demand_cert=True) - else: - lh = ipaldap.IPAdmin(thost, protocol='ldap', - no_schema=True, decode_attrs=False) + start_tls = True + root_logger.debug("Init LDAP connection to: %s", ldap_uri) + lh = ipaldap.LDAPClient( + ldap_uri, cacert=ca_cert_path, start_tls=start_tls, + no_schema=True, decode_attrs=False) try: lh.simple_bind(DN(), '') |