Bugzilla Bug 491183 - rhcs rfe - add rfc 4523 support for pkiUser and pkiCA, obsolete 2252 and 2256

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1663 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

3 files changed, 6 insertions, 6 deletions

diff --git a/pki/base/ca/shared/conf/CS.cfg.in b/pki/base/ca/shared/conf/CS.cfg.in
index e9b265f76..99f617642 100644
--- a/pki/base/ca/shared/conf/CS.cfg.in
+++ b/pki/base/ca/shared/conf/CS.cfg.in
@@ -663,14 +663,20 @@ ca.publish.publisher.impl.LdapUserCertPublisher.class=com.netscape.cms.publish.p
 ca.publish.publisher.impl.OCSPPublisher.class=com.netscape.cms.publish.publishers.OCSPPublisher
 ca.publish.publisher.instance.LdapCaCertPublisher.caCertAttr=caCertificate;binary
 ca.publish.publisher.instance.LdapCaCertPublisher.caObjectClass=certificationAuthority
+ca.publish.publisher.instance.LdapCaCertPublisher.pubtype=cacert
 ca.publish.publisher.instance.LdapCaCertPublisher.pluginName=LdapCaCertPublisher
 ca.publish.publisher.instance.LdapCrlPublisher.crlAttr=certificateRevocationList;binary
 ca.publish.publisher.instance.LdapCrlPublisher.pluginName=LdapCrlPublisher
+ca.publish.publisher.instance.LdapCrlPublisher.crlObjectClass=certificationAuthority
+ca.publish.publisher.instance.LdapCrlPublisher.pubtype=crl
 ca.publish.publisher.instance.LdapCrossCertPairPublisher.caObjectClass=certificationAuthority
 ca.publish.publisher.instance.LdapCrossCertPairPublisher.crossCertPairAttr=crossCertificatePair;binary
 ca.publish.publisher.instance.LdapCrossCertPairPublisher.pluginName=LdapCertificatePairPublisher
+ca.publish.publisher.instance.LdapCrossCertPairPublisher.pubtype=cacert
 ca.publish.publisher.instance.LdapDeltaCrlPublisher.crlAttr=deltaRevocationList;binary
+ca.publish.publisher.instance.LdapDeltaCrlPublisher.crlObjectClass=certificationAuthority,certificationAuthority-V2
 ca.publish.publisher.instance.LdapDeltaCrlPublisher.pluginName=LdapDeltaCrlPublisher
+ca.publish.publisher.instance.LdapDeltaCrlPublisher.pubtype=crl
 ca.publish.publisher.instance.LdapUserCertPublisher.certAttr=userCertificate;binary
 ca.publish.publisher.instance.LdapUserCertPublisher.pluginName=LdapUserCertPublisher
 ca.publish.rule.impl.Rule.class=com.netscape.cmscore.ldap.LdapRule
diff --git a/pki/base/ca/shared/conf/db.ldif b/pki/base/ca/shared/conf/db.ldif
index 630dbb687..f324c879e 100644
--- a/pki/base/ca/shared/conf/db.ldif
+++ b/pki/base/ca/shared/conf/db.ldif
@@ -112,7 +112,6 @@ crossCertificatePair;binary:
 dn: ou=ca,{rootSuffix}
 objectClass: top
 objectClass: organizationalUnit
-objectClass: pkiCA
 ou: ca
 
 dn: ou=certificateRepository,ou=ca,{rootSuffix}
diff --git a/pki/base/ca/shared/conf/schema.ldif b/pki/base/ca/shared/conf/schema.ldif
index 12d432201..71714ee25 100644
--- a/pki/base/ca/shared/conf/schema.ldif
+++ b/pki/base/ca/shared/conf/schema.ldif
@@ -436,11 +436,6 @@ objectClasses: ( transaction-oid NAME 'transaction' DESC 'CMS defined class' SUP
 dn: cn=schema
 changetype: modify
 add: objectClasses
-objectClasses: ( pkiCA-oid NAME 'pkiCA' DESC 'CMS defined class' SUP top STRUCTURAL MUST ou MAY certificateRevocationList X-ORIGIN 'user defined' )
-
-dn: cn=schema
-changetype: modify
-add: objectClasses
 objectClasses: ( crlIssuingPointRecord-oid NAME 'crlIssuingPointRecord' DESC 'CMS defined class' SUP top STRUCTURAL MUST cn MAY ( dateOfCreate $ dateOfModify $ crlNumber $ crlSize $ thisUpdate $ nextUpdate $ deltaNumber $ deltaSize $ firstUnsaved $ certificateRevocationList $ deltaCRL $ crlCache $ revokedCerts $ unrevokedCerts $ expiredCerts $ cACertificate ) X-ORIGIN 'user defined' )
 
 dn: cn=schema