diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-21 06:29:06 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:44 +0100 |
| commit | d11c337541a7e1f105ee55ccd268f010413e9a23 (patch) | |
| tree | 11002b64cb09ab00ad179ad17393d6256bffc229 /ipaserver | |
| parent | 334ba2e79f64786fd3918a32bcbe68e4bf1182b0 (diff) | |
| download | freeipa-d11c337541a7e1f105ee55ccd268f010413e9a23.tar.gz freeipa-d11c337541a7e1f105ee55ccd268f010413e9a23.tar.xz freeipa-d11c337541a7e1f105ee55ccd268f010413e9a23.zip | |
Remove unused bindcert and bindkey arguments to IPAdmin
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/ipaldap.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py index 95e466f6e..6488b6341 100644 --- a/ipaserver/ipaldap.py +++ b/ipaserver/ipaldap.py @@ -1554,25 +1554,18 @@ class IPAdmin(LDAPConnection): else: return 'ldap' - def __init__(self, host='', port=389, cacert=None, bindcert=None, - bindkey=None, debug=None, ldapi=False, + def __init__(self, host='', port=389, cacert=None, debug=None, ldapi=False, realm=None, protocol=None, force_schema_updates=True): self.conn = None log_mgr.get_logger(self, True) if debug and debug.lower() == "on": ldap.set_option(ldap.OPT_DEBUG_LEVEL,255) if cacert is not None: - ldap.set_option(ldap.OPT_X_TLS_CACERTFILE,cacert) - if bindcert is not None: - ldap.set_option(ldap.OPT_X_TLS_CERTFILE,bindcert) - if bindkey is not None: - ldap.set_option(ldap.OPT_X_TLS_KEYFILE,bindkey) + ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, cacert) self.port = port self.host = host self.cacert = cacert - self.bindcert = bindcert - self.bindkey = bindkey self.ldapi = ldapi self.realm = realm self.suffixes = {} |