diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-08-16 17:34:06 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2016-08-17 15:11:55 +0200 |
| commit | 4ee426a68ec60370eee6f5aec917ecce444840c7 (patch) | |
| tree | 4bd24ed32e40198df081bd037afdedcb7490ba9a | |
| parent | fea56fefff48b0d8eb147c2c2c511c869a1eadf0 (diff) | |
server install: do not prompt for cert file PIN repeatedly
Prompt for PIN only once in interactive mode.
This fixes ipa-server-install, ipa-server-certinstall and
ipa-replica-prepare prompting over and over when the PIN is empty.
https://fedorahosted.org/freeipa/ticket/6032
Reviewed-By: Pavel Vomacka <pvomacka@redhat.com>
| -rw-r--r-- | ipaserver/install/ipa_replica_prepare.py | 6 | ||||
| -rw-r--r-- | ipaserver/install/ipa_server_certinstall.py | 3 | ||||
| -rw-r--r-- | ipaserver/install/server/install.py | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/ipaserver/install/ipa_replica_prepare.py b/ipaserver/install/ipa_replica_prepare.py index a6f0f1e39..9467276f2 100644 --- a/ipaserver/install/ipa_replica_prepare.py +++ b/ipaserver/install/ipa_replica_prepare.py @@ -307,7 +307,7 @@ class ReplicaPrepare(admintool.AdminTool): if options.http_pin is None: options.http_pin = installutils.read_password( "Enter Apache Server private key unlock", - confirm=False, validate=False) + confirm=False, validate=False, retry=False) if options.http_pin is None: raise admintool.ScriptError( "Apache Server private key unlock password required") @@ -321,7 +321,7 @@ class ReplicaPrepare(admintool.AdminTool): if options.dirsrv_pin is None: options.dirsrv_pin = installutils.read_password( "Enter Directory Server private key unlock", - confirm=False, validate=False) + confirm=False, validate=False, retry=False) if options.dirsrv_pin is None: raise admintool.ScriptError( "Directory Server private key unlock password required") @@ -335,7 +335,7 @@ class ReplicaPrepare(admintool.AdminTool): if options.pkinit_pin is None: options.pkinit_pin = installutils.read_password( "Enter Kerberos KDC private key unlock", - confirm=False, validate=False) + confirm=False, validate=False, retry=False) if options.pkinit_pin is None: raise admintool.ScriptError( "Kerberos KDC private key unlock password required") diff --git a/ipaserver/install/ipa_server_certinstall.py b/ipaserver/install/ipa_server_certinstall.py index 5ab47303a..0a8fb214a 100644 --- a/ipaserver/install/ipa_server_certinstall.py +++ b/ipaserver/install/ipa_server_certinstall.py @@ -92,7 +92,8 @@ class ServerCertInstall(admintool.AdminTool): if self.options.pin is None: self.options.pin = installutils.read_password( - "Enter private key unlock", confirm=False, validate=False) + "Enter private key unlock", + confirm=False, validate=False, retry=False) if self.options.pin is None: raise admintool.ScriptError( "Private key unlock password required") diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index 48e0b9b7d..6644a6b31 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -489,7 +489,7 @@ def install_check(installer): if options.http_pin is None: options.http_pin = installutils.read_password( "Enter Apache Server private key unlock", - confirm=False, validate=False) + confirm=False, validate=False, retry=False) if options.http_pin is None: raise ScriptError( "Apache Server private key unlock password required") @@ -505,7 +505,7 @@ def install_check(installer): if options.dirsrv_pin is None: options.dirsrv_pin = read_password( "Enter Directory Server private key unlock", - confirm=False, validate=False) + confirm=False, validate=False, retry=False) if options.dirsrv_pin is None: raise ScriptError( "Directory Server private key unlock password required") @@ -521,7 +521,7 @@ def install_check(installer): if options.pkinit_pin is None: options.pkinit_pin = read_password( "Enter Kerberos KDC private key unlock", - confirm=False, validate=False) + confirm=False, validate=False, retry=False) if options.pkinit_pin is None: raise ScriptError( "Kerberos KDC private key unlock password required") |