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>

1 files changed, 3 insertions, 5 deletions

diff --git a/install/tools/ipa-httpd-kdcproxy b/install/tools/ipa-httpd-kdcproxy
index d64420640..20674c26c 100755
--- a/install/tools/ipa-httpd-kdcproxy
+++ b/install/tools/ipa-httpd-kdcproxy
@@ -29,7 +29,7 @@ import sys
 
 from ipalib import api, errors
 from ipapython.ipa_log_manager import standard_logging_setup
-from ipapython.ipaldap import IPAdmin
+from ipapython.ipaldap import LDAPClient
 from ipapython.dn import DN
 from ipaplatform.paths import paths
 
@@ -78,9 +78,7 @@ class KDCProxyConfig(object):
         """Establish LDAP connection"""
         self.log.debug('ldap_uri: %s', self.ldap_uri)
         try:
-            self.con = IPAdmin(ldap_uri=self.ldap_uri)
-            # EXTERNAL bind as root user
-            self.con.ldapi = True
+            self.con = LDAPClient(self.ldap_uri)
             self.con.do_bind()
         except (errors.NetworkError, socket.timeout) as e:
             msg = 'Unable to connect to dirsrv: %s' % e
@@ -94,7 +92,7 @@ class KDCProxyConfig(object):
             self.log.exception(msg)
             raise FatalError(msg)
 
-    def _find_entry(self, dn, attrs, filter, scope=IPAdmin.SCOPE_BASE):
+    def _find_entry(self, dn, attrs, filter, scope=LDAPClient.SCOPE_BASE):
         """Find an LDAP entry, handles NotFound and Limit"""
         try:
             entries = self.con.get_entries(