diff options
| author | Christian Heimes <cheimes@redhat.com> | 2016-10-06 16:24:43 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-14 13:57:26 +0100 |
| commit | a22a5dd676f581910ac7872c1a20322278fc7d4a (patch) | |
| tree | bab026b81619c516017d80b775e1a9e9185e323f /ipaclient/plugins | |
| parent | e1df2e0792a6a423563c4787215b284948f51582 (diff) | |
| download | freeipa-a22a5dd676f581910ac7872c1a20322278fc7d4a.tar.gz freeipa-a22a5dd676f581910ac7872c1a20322278fc7d4a.tar.xz freeipa-a22a5dd676f581910ac7872c1a20322278fc7d4a.zip | |
Use api.env.nss_dir instead of paths.IPA_NSSDB_DIR
ipaclient plugins are now using nss_dir from api.env instead of
hard-coded paths.IPA_NSSDB_DIR.
Closes: https://fedorahosted.org/freeipa/ticket/6386
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaclient/plugins')
| -rw-r--r-- | ipaclient/plugins/otptoken.py | 3 | ||||
| -rw-r--r-- | ipaclient/plugins/vault.py | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/ipaclient/plugins/otptoken.py b/ipaclient/plugins/otptoken.py index dd4a71826..885a612ad 100644 --- a/ipaclient/plugins/otptoken.py +++ b/ipaclient/plugins/otptoken.py @@ -25,7 +25,6 @@ from ipalib import api, Str, Password, _ from ipalib.messages import add_message, ResultFormattingError from ipalib.plugable import Registry from ipalib.frontend import Local -from ipaplatform.paths import paths from ipapython.dn import DN from ipapython.nsslib import NSSConnection from ipapython.version import API_VERSION @@ -174,7 +173,7 @@ class otptoken_sync(Local): # Sync the token. # pylint: disable=E1101 - handler = HTTPSHandler(dbdir=paths.IPA_NSSDB_DIR, + handler = HTTPSHandler(dbdir=api.env.nss_dir, tls_version_min=api.env.tls_version_min, tls_version_max=api.env.tls_version_max) rsp = urllib.request.build_opener(handler).open(sync_uri, query) diff --git a/ipaclient/plugins/vault.py b/ipaclient/plugins/vault.py index b8b4f2916..c099e9ee2 100644 --- a/ipaclient/plugins/vault.py +++ b/ipaclient/plugins/vault.py @@ -43,7 +43,6 @@ from ipalib import api, errors from ipalib import Bytes, Flag, Str from ipalib.plugable import Registry from ipalib import _ -from ipaplatform.paths import paths def validated_read(argname, filename, mode='r', encoding=None): @@ -752,8 +751,7 @@ class vault_archive(Local): error=_('Invalid vault type')) # initialize NSS database - current_dbdir = paths.IPA_NSSDB_DIR - nss.nss_init(current_dbdir) + nss.nss_init(api.env.nss_dir) # retrieve transport certificate config = self.api.Command.vaultconfig_show()['result'] @@ -912,8 +910,7 @@ class vault_retrieve(Local): vault_type = vault['ipavaulttype'][0] # initialize NSS database - current_dbdir = paths.IPA_NSSDB_DIR - nss.nss_init(current_dbdir) + nss.nss_init(api.env.nss_dir) # retrieve transport certificate config = self.api.Command.vaultconfig_show()['result'] |