summaryrefslogtreecommitdiffstats
path: root/base/server
diff options
context:
space:
mode:
authorAbhishek Koneru <akoneru@redhat.com>2013-04-23 18:11:04 -0400
committerAbhishek Koneru <akoneru@redhat.com>2013-04-23 23:15:01 -0400
commit5b04f46ad4ab4aee9b0113df330e75613cef8a4b (patch)
tree5de204144ca2a931c4675ca9ff177675eb49851c /base/server
parentc000265fc098b7873302161750f9c86ba703f8ca (diff)
downloadpki-5b04f46ad4ab4aee9b0113df330e75613cef8a4b.tar.gz
pki-5b04f46ad4ab4aee9b0113df330e75613cef8a4b.tar.xz
pki-5b04f46ad4ab4aee9b0113df330e75613cef8a4b.zip
Defect: Installation fails if there is only one system cert.
After configuration is done, the JSON result can have only one system cert (in case of clone installation). But the code expects a list of certs rather than a single cert. So when there is only one certificate it is added to a list and processed. Ticket #593
Diffstat (limited to 'base/server')
-rw-r--r--base/server/src/engine/pkihelper.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/base/server/src/engine/pkihelper.py b/base/server/src/engine/pkihelper.py
index df71978ed..0bcc43ee7 100644
--- a/base/server/src/engine/pkihelper.py
+++ b/base/server/src/engine/pkihelper.py
@@ -33,6 +33,7 @@ import shutil
import string
import subprocess
import time
+import types
from datetime import datetime
from grp import getgrgid
from grp import getgrnam
@@ -2994,6 +2995,8 @@ class config_client:
" " + str(response['status']),
extra=config.PKI_INDENTATION_LEVEL_2)
certs = response['systemCerts']
+ if not isinstance(certs, types.ListType):
+ certs = [certs]
for cdata in certs:
if master['pki_subsystem'] == "CA" and\
config.str2bool(master['pki_external']) and\