diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-30 07:51:46 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:46 +0100 |
| commit | 29a02a3530214d2e72667e98c5ecc25ebf5fad48 (patch) | |
| tree | 2a8141cef7b3e032213da0840510826ac7d1ed8f /ipaserver | |
| parent | fe138877d3246653e27d0024602ceb96cd07782e (diff) | |
| download | freeipa-29a02a3530214d2e72667e98c5ecc25ebf5fad48.tar.gz freeipa-29a02a3530214d2e72667e98c5ecc25ebf5fad48.tar.xz freeipa-29a02a3530214d2e72667e98c5ecc25ebf5fad48.zip | |
Use IPAdmin rather than raw python-ldap in ipactl
Add a new init argument, ldap_uri, to IPAdmin to make this possible.
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/ipaldap.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py index f3739715d..1162cbabb 100644 --- a/ipaserver/ipaldap.py +++ b/ipaserver/ipaldap.py @@ -1558,7 +1558,7 @@ class IPAdmin(LDAPClient): def __init__(self, host='', port=389, cacert=None, debug=None, ldapi=False, realm=None, protocol=None, force_schema_updates=True, - start_tls=False): + start_tls=False, ldap_uri=None): self.conn = None log_mgr.get_logger(self, True) if debug and debug.lower() == "on": @@ -1573,7 +1573,8 @@ class IPAdmin(LDAPClient): self.realm = realm self.suffixes = {} - ldap_uri = self.__get_ldap_uri(protocol or self.__guess_protocol()) + if not ldap_uri: + ldap_uri = self.__get_ldap_uri(protocol or self.__guess_protocol()) LDAPClient.__init__(self, ldap_uri) |