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/ipa-csreplica-manage | |
| 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/ipa-csreplica-manage')
| -rwxr-xr-x | install/tools/ipa-csreplica-manage | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage index b5474eb45..85b55d144 100755 --- a/install/tools/ipa-csreplica-manage +++ b/install/tools/ipa-csreplica-manage @@ -93,7 +93,8 @@ def list_replicas(realm, host, replica, dirman_passwd, verbose): try: # connect to main IPA LDAP server - conn = ipaldap.IPAdmin(host, 636, cacert=CACERT) + ldap_uri = ipaldap.get_ldap_uri(host, 636, cacert=CACERT) + conn = ipaldap.LDAPClient(ldap_uri, cacert=CACERT) conn.simple_bind(bind_dn=ipaldap.DIRMAN_DN, bind_password=dirman_passwd) @@ -295,7 +296,8 @@ def add_link(realm, replica1, replica2, dirman_passwd, options): except Exception as e: sys.exit(str(e)) try: - conn = ipaldap.IPAdmin(replica2, 636, cacert=CACERT) + ldap_uri = ipaldap.get_ldap_uri(replica2, 636, cacert=CACERT) + conn = ipaldap.LDAPClient(ldap_uri, cacert=CACERT) conn.simple_bind(bind_dn=ipaldap.DIRMAN_DN, bind_password=dirman_passwd) |