diff options
Diffstat (limited to 'pki/base/common')
| -rw-r--r-- | pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java index c66d8a71d..12965a52e 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java @@ -1002,7 +1002,8 @@ public class CertUtils { String auditMessage = null; IConfigStore config = CMS.getConfigStore(); String certlsit = ""; - boolean r = true; + boolean verifyResult = true; + boolean r = true; /* the final return value */ try { String subsysType = config.getString("cs.type", ""); if (subsysType.equals("")) { @@ -1014,8 +1015,7 @@ public class CertUtils { ""); audit(auditMessage); - r = false; - return r; + return false; } subsysType = toLowerCaseSubsystemType(subsysType); if (subsysType == null) { @@ -1027,8 +1027,7 @@ public class CertUtils { ""); audit(auditMessage); - r = false; - return r; + return false; } String certlist = config.getString(subsysType + ".cert.list", ""); if (certlist.equals("")) { @@ -1041,15 +1040,16 @@ public class CertUtils { ""); audit(auditMessage); - r = false; - return r; + return false; } StringTokenizer tokenizer = new StringTokenizer(certlist, ","); while (tokenizer.hasMoreTokens()) { String tag = tokenizer.nextToken(); tag = tag.trim(); CMS.debug("CertUtils: verifySystemCerts() cert tag=" + tag); - r = verifySystemCertByTag(tag); + verifyResult = verifySystemCertByTag(tag); + if (verifyResult == false) + r = false; //r captures the value for final return } } catch (Exception e) { // audit here |