summaryrefslogtreecommitdiffstats
path: root/base/server/python/pki/server/deployment/pkiparser.py
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2013-07-23 13:54:31 -0400
committerEndi S. Dewata <edewata@redhat.com>2013-07-23 17:01:53 -0400
commit23ce40f255de2abe3347924b3fd9e0eb2a539551 (patch)
tree7ef7dec6b2c6d5aab9446e22238bb1147c4b4a5f /base/server/python/pki/server/deployment/pkiparser.py
parentd5a63e2c0cf44f1eafecf51bd243cf794b33a515 (diff)
downloadpki-23ce40f255de2abe3347924b3fd9e0eb2a539551.tar.gz
pki-23ce40f255de2abe3347924b3fd9e0eb2a539551.tar.xz
pki-23ce40f255de2abe3347924b3fd9e0eb2a539551.zip
Fixed NullPointerException with external CA.
The deployment tool has been modified to overwrite the pki_issuing_ca when configuring with external CA regardless of the default value. Bugzilla #986901
Diffstat (limited to 'base/server/python/pki/server/deployment/pkiparser.py')
-rw-r--r--base/server/python/pki/server/deployment/pkiparser.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 8dbed8deb..be502bc01 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -945,8 +945,7 @@ class PKIConfigParser:
elif config.str2bool(self.pki_master_dict['pki_external']):
# External CA
self.pki_master_dict['pki_security_domain_type'] = "new"
- if not len(self.pki_master_dict['pki_issuing_ca']):
- self.pki_master_dict['pki_issuing_ca'] = "External CA"
+ self.pki_master_dict['pki_issuing_ca'] = "External CA"
else:
# PKI CA
self.pki_master_dict['pki_security_domain_type'] = "new"