summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-09-25 08:40:05 +0000
committerPetr Viktorin <pviktori@redhat.com>2013-10-04 10:27:23 +0200
commit194556beb04241d965561cc6bb4d050b5be8879f (patch)
tree3b2ebe0a8e75723f391f97cfb916fcb791777b4c /ipaserver
parentc123264ac77cd533a08978909f837c8f4d3e224e (diff)
downloadfreeipa-194556beb04241d965561cc6bb4d050b5be8879f.tar.gz
freeipa-194556beb04241d965561cc6bb4d050b5be8879f.tar.xz
freeipa-194556beb04241d965561cc6bb4d050b5be8879f.zip
Allow PKCS#12 files with empty password in install tools.
https://fedorahosted.org/freeipa/ticket/3897
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/ipa_replica_prepare.py8
-rw-r--r--ipaserver/install/ipa_server_certinstall.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/ipaserver/install/ipa_replica_prepare.py b/ipaserver/install/ipa_replica_prepare.py
index 55b81eeec..36d078a6b 100644
--- a/ipaserver/install/ipa_replica_prepare.py
+++ b/ipaserver/install/ipa_replica_prepare.py
@@ -209,7 +209,7 @@ class ReplicaPrepare(admintool.AdminTool):
raise admintool.ScriptError("Invalid reverse zone")
if options.http_pkcs12:
- if not options.http_pin:
+ if options.http_pin is None:
options.http_pin = installutils.read_password(
"Enter %s unlock" % options.http_pkcs12,
confirm=False, validate=False)
@@ -219,7 +219,7 @@ class ReplicaPrepare(admintool.AdminTool):
self.check_pkcs12(options.http_pkcs12, options.http_pin)
if options.dirsrv_pkcs12:
- if not options.dirsrv_pin:
+ if options.dirsrv_pin is None:
options.dirsrv_pin = installutils.read_password(
"Enter %s unlock" % options.dirsrv_pkcs12,
confirm=False, validate=False)
@@ -229,7 +229,7 @@ class ReplicaPrepare(admintool.AdminTool):
self.check_pkcs12(options.dirsrv_pkcs12, options.dirsrv_pin)
if options.pkinit_pkcs12:
- if not options.pkinit_pin:
+ if options.pkinit_pin is None:
options.pkinit_pin = installutils.read_password(
"Enter %s unlock" % options.pkinit_pkcs12,
confirm=False, validate=False)
@@ -239,7 +239,7 @@ class ReplicaPrepare(admintool.AdminTool):
if (not ipautil.file_exists(
dogtag.configured_constants().CS_CFG_PATH) and
- not options.dirsrv_pin):
+ options.dirsrv_pin is None):
self.log.info("If you installed IPA with your own certificates "
"using PKCS#12 files you must provide PKCS#12 files for any "
"replicas you create as well.")
diff --git a/ipaserver/install/ipa_server_certinstall.py b/ipaserver/install/ipa_server_certinstall.py
index 1aa27b2e6..87c4eaf15 100644
--- a/ipaserver/install/ipa_server_certinstall.py
+++ b/ipaserver/install/ipa_server_certinstall.py
@@ -87,7 +87,7 @@ class ServerCertInstall(admintool.AdminTool):
raise admintool.ScriptError(
"Directory Manager password required")
- if not self.options.pin:
+ if self.options.pin is None:
self.options.pin = installutils.read_password(
"Enter %s unlock" % self.args[0], confirm=False, validate=False)
if self.options.pin is None: