diff options
Diffstat (limited to 'base/ca')
| -rw-r--r-- | base/ca/shared/conf/CS.cfg.in | 1 | ||||
| -rw-r--r-- | base/ca/src/com/netscape/ca/CertificateAuthority.java | 13 |
2 files changed, 10 insertions, 4 deletions
diff --git a/base/ca/shared/conf/CS.cfg.in b/base/ca/shared/conf/CS.cfg.in index d10d9bcd0..3f25d0ec3 100644 --- a/base/ca/shared/conf/CS.cfg.in +++ b/base/ca/shared/conf/CS.cfg.in @@ -833,6 +833,7 @@ preop.internaldb.post_ldif=/usr/share/pki/ca/conf/vlv.ldif,/usr/share/pki/ca/con preop.internaldb.wait_dn=cn=index1160589769, cn=index, cn=tasks, cn=config preop.internaldb.index_task_ldif=/usr/share/pki/ca/conf/indextasks.ldif preop.internaldb.index_wait_dn=cn=index1160589770,cn=index,cn=tasks,cn=config +preop.internaldb.usn.ldif=/usr/share/pki/server/conf/usn.ldif internaldb.multipleSuffix.enable=false jobsScheduler._000=## jobsScheduler._001=## jobScheduler diff --git a/base/ca/src/com/netscape/ca/CertificateAuthority.java b/base/ca/src/com/netscape/ca/CertificateAuthority.java index d96b88414..37f1e95fc 100644 --- a/base/ca/src/com/netscape/ca/CertificateAuthority.java +++ b/base/ca/src/com/netscape/ca/CertificateAuthority.java @@ -163,7 +163,6 @@ import netscape.ldap.LDAPSearchResults; import netscape.ldap.controls.LDAPEntryChangeControl; import netscape.ldap.controls.LDAPPersistSearchControl; import netscape.ldap.util.DN; - import netscape.security.pkcs.PKCS10; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -3003,8 +3002,14 @@ public class CertificateAuthority AuthorityID aid = new AuthorityID((String) aidAttr.getStringValues().nextElement()); - Integer newEntryUSN = new Integer( - entry.getAttribute("entryUSN").getStringValueArray()[0]); + LDAPAttribute entryUSN = entry.getAttribute("entryUSN"); + if (entryUSN == null) { + log(ILogger.LL_FAILURE, "Authority entry has no entryUSN. " + + "This is likely because the USN plugin is not enabled in the database"); + return; + } + + Integer newEntryUSN = new Integer(entryUSN.getStringValueArray()[0]); CMS.debug("readAuthority: new entryUSN = " + newEntryUSN); Integer knownEntryUSN = entryUSNs.get(aid); if (knownEntryUSN != null) { @@ -3085,7 +3090,7 @@ public class CertificateAuthority AuthorityID aid = null; attr = entry.getAttribute("authorityID"); if (attr != null) { - aid = new AuthorityID((String) attr.getStringValueArray()[0]); + aid = new AuthorityID(attr.getStringValueArray()[0]); forgetAuthority(aid); } } |