summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/installutils.py
diff options
context:
space:
mode:
Diffstat (limited to 'ipaserver/install/installutils.py')
-rw-r--r--ipaserver/install/installutils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index 67c3fa9b..67eabc25 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -720,7 +720,7 @@ def check_pkcs12(pkcs12_info, ca_file, hostname):
Return a (server cert name, CA cert names) tuple
"""
- pkcs12_filename, pin_filename = pkcs12_info
+ pkcs12_filename, pkcs12_passwd = pkcs12_info
root_logger.debug('Checking PKCS#12 certificate %s', pkcs12_filename)
db_pwd_file = ipautil.write_tmp_file(ipautil.ipa_generate_password())
with certs.NSSDatabase() as nssdb:
@@ -735,7 +735,7 @@ def check_pkcs12(pkcs12_info, ca_file, hostname):
raise ScriptError(str(e))
# Import everything in the PKCS#12
- nssdb.import_pkcs12(pkcs12_filename, db_pwd_file.name, pin_filename)
+ nssdb.import_pkcs12(pkcs12_filename, db_pwd_file.name, pkcs12_passwd)
# Check we have exactly one server cert (one with a private key)
server_certs = nssdb.find_server_certs()