BZ Bug 565842 - CA Clone instance configuration throws errors

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

3 files changed, 14 insertions, 4 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
index 08f0686c..258c36b6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
@@ -192,7 +192,7 @@ public class CertUtil {
         // just need a request, no need to get into a queue
 //        IRequest r = new EnrollmentRequest(rid);
         CMS.debug("CertUtil: createLocalRequest for serial: "+ serialNum);
-        IRequest req = queue.newRequest("enrollment", serialNum);
+        IRequest req = queue.newRequest("enrollment");
         CMS.debug("certUtil: newRequest called");
         req.setExtData("profile", "true");
         req.setExtData("requestversion", "1.0.0");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
index 1c71780d..cbc509a8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
@@ -984,8 +984,12 @@ public class DatabasePanel extends WizardPanelBase {
 
             try {
                 CMS.reinit(IDBSubsystem.SUB_ID);
+                String type = cs.getString("cs.type", "");
+                if (type.equals("CA"))
+                    CMS.reinit(ICertificateAuthority.ID);
                 CMS.reinit(IAuthSubsystem.ID);
                 CMS.reinit(IAuthzSubsystem.ID);
+                CMS.reinit(IUGSubsystem.ID);
             } catch (Exception e) {
             }
         }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
index 01126e22..890d6dfb 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
@@ -151,6 +151,14 @@ public class UpdateNumberRange extends CMSServlet {
                     repo = ca.getReplicaRepository();
                 }
             }
+
+            // checkRanges for replicaID - we do this each time a replica is created.
+            // This needs to be done beforehand to ensure that we always have enough 
+            // replica numbers
+            if (type.equals("replicaId")) {
+               CMS.debug("Checking replica number ranges");
+               repo.checkRanges();
+            }
                
             if (type.equals("request")) {
                 radix = 10;
@@ -222,10 +230,8 @@ public class UpdateNumberRange extends CMSServlet {
                 return;
             }
 
-            // checkRanges for replicaID - we do this each time a replica is created.
-            // Also enable serial number management in master for certs and requests
+            // Enable serial number management in master for certs and requests
             if (type.equals("replicaId")) {
-               repo.checkRanges();
                repo.setEnableSerialMgmt(true);
             }