diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-09-25 08:40:05 +0000 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2013-10-04 10:27:23 +0200 |
| commit | 194556beb04241d965561cc6bb4d050b5be8879f (patch) | |
| tree | 3b2ebe0a8e75723f391f97cfb916fcb791777b4c /install/tools | |
| parent | c123264ac77cd533a08978909f837c8f4d3e224e (diff) | |
| download | freeipa-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 'install/tools')
| -rw-r--r-- | install/tools/ipa-server-install | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index aa424c377..0374efea3 100644 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -274,11 +274,11 @@ def parse_options(): "PKCS#12 options are used.") if options.unattended: - if options.dirsrv_pkcs12 and not options.dirsrv_pin: + if options.dirsrv_pkcs12 and options.dirsrv_pin is None: parser.error("You must specify --dirsrv_pin with --dirsrv_pkcs12") - if options.http_pkcs12 and not options.http_pin: + if options.http_pkcs12 and options.http_pin is None: parser.error("You must specify --http_pin with --http_pkcs12") - if options.pkinit_pkcs12 and not options.pkinit_pin: + if options.pkinit_pkcs12 and options.pkinit_pin is None: parser.error("You must specify --pkinit_pin with --pkinit_pkcs12") if options.dirsrv_pkcs12 and not options.root_ca_file: @@ -876,7 +876,7 @@ def main(): ca_file = options.root_ca_file 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) @@ -887,7 +887,7 @@ def main(): http_pkcs12_info, ca_file, host_name) 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) @@ -898,7 +898,7 @@ def main(): dirsrv_pkcs12_info, ca_file, host_name) 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) |