diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-11-22 14:42:33 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 14:50:51 +0100 |
| commit | 977050c66bccd7b8cf468c115d73250505a01034 (patch) | |
| tree | 21d42ca82e118c2a70ec15a0cd84567f914347fc /ipaserver/plugins | |
| parent | a2c58889735c794cd1e93331c755b6f9ba273773 (diff) | |
| download | freeipa-977050c66bccd7b8cf468c115d73250505a01034.tar.gz freeipa-977050c66bccd7b8cf468c115d73250505a01034.tar.xz freeipa-977050c66bccd7b8cf468c115d73250505a01034.zip | |
constants: remove CACERT
CACERT depends on ipaplatform.
Replace all uses of CACERT with paths.IPA_CA_CRT and remove CACERT.
https://fedorahosted.org/freeipa/ticket/6474
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaserver/plugins')
| -rw-r--r-- | ipaserver/plugins/ldap2.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py index 82b2dba0e..a04be38e3 100644 --- a/ipaserver/plugins/ldap2.py +++ b/ipaserver/plugins/ldap2.py @@ -31,7 +31,8 @@ import os import ldap as _ldap -from ipalib import krb_utils, constants +from ipalib import krb_utils +from ipaplatform.paths import paths from ipapython.dn import DN from ipapython.ipaldap import (LDAPClient, AUTOBIND_AUTO, AUTOBIND_ENABLED, AUTOBIND_DISABLED) @@ -154,7 +155,7 @@ class ldap2(CrudBackend, LDAPClient): assert isinstance(bind_dn, DN) if cacert is None: - cacert = constants.CACERT + cacert = paths.IPA_CA_CRT if time_limit is not _missing: self.time_limit = time_limit |