diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2015-05-29 15:04:40 -0400 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2015-05-29 16:46:35 -0400 |
| commit | ea2341c5078b1a518b55456ad71661758dab325e (patch) | |
| tree | 4eeaca592d08302a5504c4537da1d6df4f472c02 | |
| parent | 1ef3571d796ca7cc51bce4feaec539eb84d1b3f4 (diff) | |
| download | pki-ea2341c5078b1a518b55456ad71661758dab325e.tar.gz pki-ea2341c5078b1a518b55456ad71661758dab325e.tar.xz pki-ea2341c5078b1a518b55456ad71661758dab325e.zip | |
Fixed overwritten deployment property.
The pki_pin has been removed from the default.cfg to avoid
overwriting the randomly generated default value.
https://fedorahosted.org/pki/ticket/1393
| -rw-r--r-- | base/server/etc/default.cfg | 1 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg index fd4347900..58f338692 100644 --- a/base/server/etc/default.cfg +++ b/base/server/etc/default.cfg @@ -99,7 +99,6 @@ pki_issuing_ca_hostname=%(pki_security_domain_hostname)s pki_issuing_ca_https_port=%(pki_security_domain_https_port)s pki_issuing_ca_uri=https://%(pki_issuing_ca_hostname)s:%(pki_issuing_ca_https_port)s pki_issuing_ca=%(pki_issuing_ca_uri)s -pki_pin= pki_replication_password= pki_restart_configured_instance=True pki_security_domain_hostname=%(pki_hostname)s diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index fe1a54a3a..7e1813c75 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -566,7 +566,7 @@ class PKIConfigParser: pin_high = 999999999999 # use user-provided PIN if specified - if not self.mdict['pki_pin']: + if 'pki_pin' not in self.mdict: # otherwise generate a random password self.mdict['pki_pin'] = \ random.randint(pin_low, pin_high) |