diff options
Diffstat (limited to 'base/common')
| -rw-r--r-- | base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java | 5 | ||||
| -rw-r--r-- | base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java b/base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java index 46c597b4d..5c337afee 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java +++ b/base/common/src/com/netscape/cms/servlet/cert/FilterBuilder.java @@ -177,8 +177,9 @@ public class FilterBuilder { } String queryCertFilter = null; StringTokenizer st = new StringTokenizer(reasons, ","); + int count = st.countTokens(); if (st.hasMoreTokens()) { - filter.append("(|"); + if (count >=2) filter.append("(|"); while (st.hasMoreTokens()) { String token = st.nextToken(); if (queryCertFilter == null) { @@ -188,7 +189,7 @@ public class FilterBuilder { filter.append(LDAPUtil.escapeFilter(token)); filter.append(")"); } - filter.append(")"); + if (count >= 2) filter.append(")"); } } diff --git a/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java b/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java index 15fe408dd..ef8577747 100644 --- a/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java @@ -317,7 +317,7 @@ public class X509CertImplMapper implements IDBAttrMapper { name = CertDBSchema.LDAP_ATTR_EXTENSION; } else if (suffix.equalsIgnoreCase(ICertRecord.ATTR_REVO_INFO)) { name = CertDBSchema.LDAP_ATTR_REVO_INFO; - value = "*;CRLReasonExtension=" + value + "*"; + value = "*;CRLReasonExtension=" + value; } else if (suffix.equalsIgnoreCase("nsExtension.SSLClient")) { // special case for NS cert type extension name = CertDBSchema.LDAP_ATTR_EXTENSION; |