summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorawnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-01-05 01:24:41 +0000
committerawnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2011-01-05 01:24:41 +0000
commit25feadffd3021d72de80a314e63e8bfd661ee9b9 (patch)
treef59d5ee689445297a794a46a0fd216bfe5e5efd6
parentfc62f5b8e0fadf386e89aa57f38501715757bb15 (diff)
downloadpki-25feadffd3021d72de80a314e63e8bfd661ee9b9.tar.gz
pki-25feadffd3021d72de80a314e63e8bfd661ee9b9.tar.xz
pki-25feadffd3021d72de80a314e63e8bfd661ee9b9.zip
Fixed bugzilla bug #491183.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1689 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r--pki/base/ca/shared/conf/CS.cfg.in12
-rw-r--r--pki/base/ca/shared/conf/db.ldif2
-rw-r--r--pki/base/kra/shared/conf/db.ldif2
-rw-r--r--pki/base/ocsp/shared/conf/db.ldif2
-rw-r--r--pki/base/tks/shared/conf/db.ldif2
5 files changed, 8 insertions, 12 deletions
diff --git a/pki/base/ca/shared/conf/CS.cfg.in b/pki/base/ca/shared/conf/CS.cfg.in
index 2cb914f87..21e23f15a 100644
--- a/pki/base/ca/shared/conf/CS.cfg.in
+++ b/pki/base/ca/shared/conf/CS.cfg.in
@@ -663,21 +663,17 @@ ca.publish.publisher.impl.LdapDeltaCrlPublisher.class=com.netscape.cms.publish.p
ca.publish.publisher.impl.LdapUserCertPublisher.class=com.netscape.cms.publish.publishers.LdapUserCertPublisher
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.caObjectClass=pkiCA
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.LdapCrlPublisher.crlObjectClass=pkiCA
+ca.publish.publisher.instance.LdapCrossCertPairPublisher.caObjectClass=pkiCA
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.crlObjectClass=pkiCA,deltaCRL
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 f324c879e..00fa919b7 100644
--- a/pki/base/ca/shared/conf/db.ldif
+++ b/pki/base/ca/shared/conf/db.ldif
@@ -103,7 +103,7 @@ cn: crossCerts
sn: crossCerts
objectClass: top
objectClass: person
-objectClass: certificationAuthority
+objectClass: pkiCA
cACertificate;binary:
authorityRevocationList;binary:
certificateRevocationList;binary:
diff --git a/pki/base/kra/shared/conf/db.ldif b/pki/base/kra/shared/conf/db.ldif
index fc10b8aa5..c07e9f1a6 100644
--- a/pki/base/kra/shared/conf/db.ldif
+++ b/pki/base/kra/shared/conf/db.ldif
@@ -55,7 +55,7 @@ cn: crossCerts
sn: crossCerts
objectClass: top
objectClass: person
-objectClass: certificationAuthority
+objectClass: pkiCA
cACertificate;binary:
authorityRevocationList;binary:
certificateRevocationList;binary:
diff --git a/pki/base/ocsp/shared/conf/db.ldif b/pki/base/ocsp/shared/conf/db.ldif
index 69262fdb8..ec159e02f 100644
--- a/pki/base/ocsp/shared/conf/db.ldif
+++ b/pki/base/ocsp/shared/conf/db.ldif
@@ -60,7 +60,7 @@ cn: crossCerts
sn: crossCerts
objectClass: top
objectClass: person
-objectClass: certificationAuthority
+objectClass: pkiCA
cACertificate;binary:
authorityRevocationList;binary:
certificateRevocationList;binary:
diff --git a/pki/base/tks/shared/conf/db.ldif b/pki/base/tks/shared/conf/db.ldif
index 0739c0066..6aaa310a9 100644
--- a/pki/base/tks/shared/conf/db.ldif
+++ b/pki/base/tks/shared/conf/db.ldif
@@ -60,7 +60,7 @@ cn: crossCerts
sn: crossCerts
objectClass: top
objectClass: person
-objectClass: certificationAuthority
+objectClass: pkiCA
cACertificate;binary:
authorityRevocationList;binary:
certificateRevocationList;binary: