IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use api.env.nss_dir instead of paths.IPA_NSSDB_DIR

Browse Source 
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>
This commit is contained in:
Christian Heimes 2016-10-06 16:24:43 +02:00 committed by Martin Basti
parent e1df2e0792
commit a22a5dd676
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipaclient/ipa_certupdate.py
View File

@ -111,7 +111,7 @@ class CertUpdate(admintool.AdminTool):
def update_client(self, certs): def update_client(self, certs):
self.update_file(paths.IPA_CA_CRT, certs) self.update_file(paths.IPA_CA_CRT, certs)
ipa_db = certdb.NSSDatabase(paths.IPA_NSSDB_DIR) ipa_db = certdb.NSSDatabase(api.env.nss_dir)
# Remove old IPA certs from /etc/ipa/nssdb # Remove old IPA certs from /etc/ipa/nssdb
for nickname in ('IPA CA', 'External CA cert'): for nickname in ('IPA CA', 'External CA cert'):

3
ipaclient/plugins/otptoken.py
View File

@ -25,7 +25,6 @@ from ipalib import api, Str, Password, _
from ipalib.messages import add_message, ResultFormattingError from ipalib.messages import add_message, ResultFormattingError
from ipalib.plugable import Registry from ipalib.plugable import Registry
from ipalib.frontend import Local from ipalib.frontend import Local
from ipaplatform.paths import paths
from ipapython.dn import DN from ipapython.dn import DN
from ipapython.nsslib import NSSConnection from ipapython.nsslib import NSSConnection
from ipapython.version import API_VERSION from ipapython.version import API_VERSION
@ -174,7 +173,7 @@ class otptoken_sync(Local):
# Sync the token. # Sync the token.
# pylint: disable=E1101 # 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_min=api.env.tls_version_min,
tls_version_max=api.env.tls_version_max) tls_version_max=api.env.tls_version_max)
rsp = urllib.request.build_opener(handler).open(sync_uri, query) rsp = urllib.request.build_opener(handler).open(sync_uri, query)

7
ipaclient/plugins/vault.py
View File

@ -43,7 +43,6 @@ from ipalib import api, errors
from ipalib import Bytes, Flag, Str from ipalib import Bytes, Flag, Str
from ipalib.plugable import Registry from ipalib.plugable import Registry
from ipalib import _ from ipalib import _
from ipaplatform.paths import paths
def validated_read(argname, filename, mode='r', encoding=None): def validated_read(argname, filename, mode='r', encoding=None):
@ -752,8 +751,7 @@ class vault_archive(Local):
error=_('Invalid vault type')) error=_('Invalid vault type'))
# initialize NSS database # initialize NSS database
current_dbdir = paths.IPA_NSSDB_DIR nss.nss_init(api.env.nss_dir)
nss.nss_init(current_dbdir)
# retrieve transport certificate # retrieve transport certificate
config = self.api.Command.vaultconfig_show()['result'] config = self.api.Command.vaultconfig_show()['result']
@ -912,8 +910,7 @@ class vault_retrieve(Local):
vault_type = vault['ipavaulttype'][0] vault_type = vault['ipavaulttype'][0]
# initialize NSS database # initialize NSS database
current_dbdir = paths.IPA_NSSDB_DIR nss.nss_init(api.env.nss_dir)
nss.nss_init(current_dbdir)
# retrieve transport certificate # retrieve transport certificate
config = self.api.Command.vaultconfig_show()['result'] config = self.api.Command.vaultconfig_show()['result']