Fixed bugzilla bug #491183.

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

4 files changed, 16 insertions, 16 deletions

diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
index 9f39f736d..5b6533e13 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
+++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
@@ -38,7 +38,7 @@ import com.netscape.certsrv.publish.*;
 public class LdapCaCertPublisher 
     implements ILdapPublisher, IExtendedPluginInfo {
     public static final String LDAP_CACERT_ATTR = "caCertificate;binary";
-    public static final String LDAP_CA_OBJECTCLASS = "certificationAuthority";
+    public static final String LDAP_CA_OBJECTCLASS = "pkiCA";
     public static final String LDAP_ARL_ATTR = "authorityRevocationList;binary";
     public static final String LDAP_CRL_ATTR = "certificateRevocationList;binary";
 
@@ -246,9 +246,7 @@ public class LdapCaCertPublisher
                     modSet.add(LDAPModification.ADD,
                         new LDAPAttribute("objectclass", oc));
 
-                    if ((!attrsAdded) && 
-                        (oc.equalsIgnoreCase("certificationAuthority") || 
-                         oc.equalsIgnoreCase("certificationAuthority-V2"))) {
+                    if ((!attrsAdded) && oc.equalsIgnoreCase("certificationAuthority")) {
                         // add MUST attributes
                         if (arls == null) 
                             modSet.add(LDAPModification.ADD,
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
index 1ef14fb96..ca8a07ef4 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
+++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
@@ -39,7 +39,7 @@ import com.netscape.certsrv.publish.*;
 public class LdapCertificatePairPublisher 
     implements ILdapPublisher, IExtendedPluginInfo {
     public static final String LDAP_CROSS_CERT_PAIR_ATTR = "crossCertificatePair;binary";
-    public static final String LDAP_CA_OBJECTCLASS = "certificationAuthority";
+    public static final String LDAP_CA_OBJECTCLASS = "pkiCA";
     public static final String LDAP_ARL_ATTR = "authorityRevocationList;binary";
     public static final String LDAP_CRL_ATTR = "certificateRevocationList;binary";
     public static final String LDAP_CACERT_ATTR = "caCertificate;binary";
@@ -220,9 +220,7 @@ public class LdapCertificatePairPublisher
                     modSet.add(LDAPModification.ADD,
                         new LDAPAttribute("objectclass", oc));
 
-                    if ((!attrsAdded) && 
-                        (oc.equalsIgnoreCase("certificationAuthority") || 
-                         oc.equalsIgnoreCase("certificationAuthority-V2"))) {
+                    if ((!attrsAdded) && oc.equalsIgnoreCase("certificationAuthority")) {
                         // add MUST attributes
                         if (arls == null) 
                             modSet.add(LDAPModification.ADD,
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
index ebe86ad91..074d21ee0 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
+++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
@@ -44,8 +44,7 @@ public class LdapCrlPublisher implements ILdapPublisher, IExtendedPluginInfo {
     public static final String LDAP_CACERT_ATTR = "caCertificate;binary";
     public static final String LDAP_ARL_ATTR = "authorityRevocationList;binary";
     public static final String LDAP_CRL_ATTR = "certificateRevocationList;binary";
-    public static final String LDAP_CRL_OBJECTCLASS = "certificationAuthority,certficationAuthority-V2"; 
-
+    public static final String LDAP_CRL_OBJECTCLASS = "pkiCA,deltaCRL";
 
     protected String mCrlAttr = LDAP_CRL_ATTR;
     protected String mCrlObjectClass = LDAP_CRL_OBJECTCLASS;
@@ -212,9 +211,7 @@ public class LdapCrlPublisher implements ILdapPublisher, IExtendedPluginInfo {
                     modSet.add(LDAPModification.ADD,
                         new LDAPAttribute("objectclass", oc));
 
-                    if ((!attrsAdded) &&
-                        (oc.equalsIgnoreCase("certificationAuthority") ||
-                         oc.equalsIgnoreCase("certificationAuthority-V2"))) {
+                    if ((!attrsAdded) && oc.equalsIgnoreCase("certificationAuthority")) {
                         // add MUST attributes
                         if (arls == null)
                             modSet.add(LDAPModification.ADD,
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
index d7639fdb2..d840f6cda 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
@@ -2768,6 +2768,7 @@ public class PublisherAdminServlet extends AdminServlet {
         ILdapPublisher oldinst = mProcessor.getPublisherInstance(id);
         Vector oldConfigParms = oldinst.getInstanceParams();
         NameValuePairs saveParams = new NameValuePairs();
+        String pubType = "";
 
         // implName is always required so always include it it.
         saveParams.add("pluginName", implname);
@@ -2775,9 +2776,16 @@ public class PublisherAdminServlet extends AdminServlet {
             for (int i = 0; i < oldConfigParms.size(); i++) {
                 String kv = (String) oldConfigParms.elementAt(i);
                 int index = kv.indexOf('=');
+                if (index > -1) {
+                    if (kv.substring(0, index).equalsIgnoreCase("caObjectClass")) {
+                        pubType = "cacert";
+                    } else if (kv.substring(0, index).equalsIgnoreCase("crlObjectClass")) {
+                        pubType = "crl";
+                    }
 
-                saveParams.add(kv.substring(0, index), 
-                    kv.substring(index + 1));
+                    saveParams.add(kv.substring(0, index), 
+                        kv.substring(index + 1));
+                }
             }
         }
 
@@ -2790,7 +2798,6 @@ public class PublisherAdminServlet extends AdminServlet {
         IConfigStore instancesConfig = destStore.getSubStore("instance");
 
         // get objects added and deleted
-        String pubType = instancesConfig.getString(id + ".pubtype", "");
         if (pubType.equals("cacert")) {
             saveParams.add("caObjectClassAdded", instancesConfig.getString(id + ".caObjectClassAdded", ""));
             saveParams.add("caObjectClassDeleted", instancesConfig.getString(id + ".caObjectClassDeleted", ""));