Fix for Bugs: 223324, 430745, 224765, 223309

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

13 files changed, 133 insertions, 118 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
index 295c163cf..ba59ec2c1 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
@@ -210,22 +210,22 @@ public class AdminAuthenticatePanel extends WizardPanelBase {
             while (tok.hasMoreTokens()) {
                 String t1 = tok.nextToken();
                 c1.append(",");
-                c1.append("preop.cert.");
+                c1.append("cloning.");
                 c1.append(t1);
                 c1.append(".nickname,");
-                c1.append("preop.cert.");
+                c1.append("cloning.");
                 c1.append(t1);
                 c1.append(".dn,");
-                c1.append("preop.cert.");
+                c1.append("cloning.");
                 c1.append(t1);
                 c1.append(".keytype,");
-                c1.append("preop.cert.");
+                c1.append("cloning.");
                 c1.append(t1);
                 c1.append(".privkey.id,");
-                c1.append("preop.cert.");
+                c1.append("cloning.");
                 c1.append(t1);
                 c1.append(".pubkey.exponent,");
-                c1.append("preop.cert.");
+                c1.append("cloning.");
                 c1.append(t1);
                 c1.append(".pubkey.modulus");
                 
@@ -241,7 +241,7 @@ public class AdminAuthenticatePanel extends WizardPanelBase {
                 c1.append(",preop.ca.hostname,preop.ca.httpport,preop.ca.httpsport,preop.ca.list,preop.ca.pkcs7,preop.ca.type");
             }
 
-            String content = "uid="+uid+"&pwd="+pwd+"&op=get&names=preop.module.token,instanceId,internaldb.basedn,internaldb.ldapauth.password,internaldb.ldapconn.host,internaldb.ldapconn.port,internaldb.ldapauth.bindDN"+c1.toString()+"&substores="+s1.toString();
+            String content = "uid="+uid+"&pwd="+pwd+"&op=get&names=cloning.module.token,instanceId,internaldb.basedn,internaldb.ldapauth.password,internaldb.replication.password,internaldb.ldapconn.host,internaldb.ldapconn.port,internaldb.ldapauth.bindDN"+c1.toString()+"&substores="+s1.toString();
 
             boolean success = updateConfigEntries(host, httpsport, true,
               "/"+cstype+"/admin/"+cstype+"/getConfigEntries", content, config,
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
index cea666245..0f6bccb9b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
@@ -138,14 +138,11 @@ public class AdminPanel extends WizardPanelBase {
 
         String type = "";
         String info = "";
-        String clone = "";
         context.put("import", "true");
 
         try {
             type = cs.getString("preop.ca.type", "");
             String subsystemtype = cs.getString("cs.type", "");
-            clone = cs.getString("preop.subsystem.select", "");
-            context.put("clone", clone);
         } catch (Exception e) {}
 
         if (isPanelDone()) {
@@ -196,15 +193,6 @@ public class AdminPanel extends WizardPanelBase {
             HttpServletResponse response,
             Context context) throws IOException
     {
-        IConfigStore config = CMS.getConfigStore();
-        try {
-            String s = config.getString("preop.subsystem.select", "");
-            context.put("clone", s);
-            if (s.equals("clone"))
-                return;
-        } catch (Exception e) {
-        }
-
         String pwd = HttpInput.getPassword(request, "__pwd");
         String pwd_again = HttpInput.getPassword(request, "__admin_password_again");
         String email = HttpInput.getEmail(request, "email");
@@ -250,16 +238,6 @@ public class AdminPanel extends WizardPanelBase {
             String subsystemtype = config.getString("cs.type", "");
         } catch (Exception e) {}
 
-        String select = "";
-        try {
-            select = config.getString("preop.subsystem.select", "");
-            context.put("clone", select);
-            if (select.equals("clone")) {
-                return;
-            }
-        } catch (Exception e) {
-        }
-
         ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca");
 
         if (ca == null) { 
@@ -619,17 +597,13 @@ public class AdminPanel extends WizardPanelBase {
         String type = "";
         String info = "";
 
-        String clone = "";
         try {
-
-            clone = cs.getString("preop.subsystem.select", "");
             type = cs.getString("preop.ca.type", "");
         } catch (Exception e) {}
         if (ca == null && type.equals("otherca")) { 
             info = "Since you do not join the Redhat CA network, the administrator's certificate will not be generated automatically.";
         }
         context.put("info", info);
-        context.put("clone", clone);
         context.put("admin_email", request.getParameter("email"));
         context.put("admin_name", request.getParameter("name"));
         context.put("admin_pwd", "");
@@ -637,6 +611,20 @@ public class AdminPanel extends WizardPanelBase {
         context.put("admin_uid", request.getParameter("uid"));
     }
 
+    public boolean shouldSkip() {
+        try {
+            IConfigStore c = CMS.getConfigStore();
+            String s = c.getString("preop.subsystem.select",null);
+            if (s != null && s.equals("clone")) {
+                return true;
+            }
+        } catch (EBaseException e) {
+        }
+
+        return false;
+    }
+
+
     private void createPKCS7(X509CertImpl cert) {
         try {
             IConfigStore cs = CMS.getConfigStore();
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
index 10b9b55fb..1767bdf84 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
@@ -503,6 +503,9 @@ public class CertRequestPanel extends WizardPanelBase {
                 if (!enable)
                     continue;
 
+                if (hasErr) 
+                    continue;
+
                 String nickname = cert.getNickname();
 
                 CMS.debug(
@@ -559,6 +562,7 @@ public class CertRequestPanel extends WizardPanelBase {
                                     "CertRequestPanel configCert: Failed to import certificate "
                                             + certTag + " Exception: "
                                             + ee.toString());
+                            hasErr = true;
                         }
                     }
                 } else if (cert.getType().equals("remote")) {
@@ -616,7 +620,7 @@ public class CertRequestPanel extends WizardPanelBase {
                                     CryptoUtil.importCertificateChain(
 				      CryptoUtil.normalizeCertAndReq(b64chain));
                                   } catch (Exception e) {
-                CMS.debug("CertRequestPanel: importCertChain: Exception: "+e.toString());
+                                      CMS.debug("CertRequestPanel: importCertChain: Exception: "+e.toString());
                                   }
                                 }
 
@@ -634,11 +638,17 @@ public class CertRequestPanel extends WizardPanelBase {
                                         "CertRequestPanel configCert: Failed to import certificate "
                                                 + certTag + " Exception: "
                                                 + ee.toString());
+                                hasErr=true;
                             }
                         } else {
                             CMS.debug("CertRequestPanel: in update() input null");
+                            hasErr = true;
                         }
+                    } else {
+                       CMS.debug("CertRequestPanel: in update() b64 not set");
+                       hasErr=true;
                     }
+                    
                 } else {
                     b64 = CryptoUtil.stripCertBrackets(b64.trim());
                     String certs = CryptoUtil.normalizeCertStr(b64);
@@ -661,6 +671,7 @@ public class CertRequestPanel extends WizardPanelBase {
                             CryptoUtil.importUserCertificate(impl, nickname, false);
                     } catch (Exception ee) {
                         CMS.debug("CertRequestPanel: Failed to import user certificate."+ee.toString());
+                        hasErr=true;
                     }
                 }
 
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 d65de33cd..985b5f244 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
@@ -886,6 +886,10 @@ public class DatabasePanel extends WizardPanelBase {
         }
 
         String bindpwd = HttpInput.getPassword(request, "__bindpwd");
+
+        /* BZ 430745 create password for replication manager */
+        String replicationpwd = Integer.toString(new Random().nextInt());
+
         IConfigStore psStore = null;
         String passwordFile = null;
 
@@ -897,6 +901,8 @@ public class DatabasePanel extends WizardPanelBase {
             throw new IOException( e.toString() );
         }
         psStore.putString("internaldb", bindpwd);
+        psStore.putString("replicationdb", replicationpwd);
+        cs.putString("preop.internaldb.replicationpwd" , replicationpwd);
         cs.putString("preop.database.removeData", "false");
 
         try {
@@ -1012,12 +1018,14 @@ public class DatabasePanel extends WizardPanelBase {
         int master1_port = -1;
         String master1_binddn = "";
         String master1_bindpwd = "";
+        String master1_replicationpwd = "";
 
         try {
             master1_hostname = cs.getString("preop.internaldb.master.hostname", "");
             master1_port = cs.getInteger("preop.internaldb.master.port", -1);
             master1_binddn = cs.getString("preop.internaldb.master.binddn", "");
             master1_bindpwd = cs.getString("preop.internaldb.master.bindpwd", "");
+            master1_replicationpwd = cs.getString("preop.internaldb.master.replicationpwd", "");
         } catch (Exception e) {
         }
 
@@ -1025,12 +1033,14 @@ public class DatabasePanel extends WizardPanelBase {
         int master2_port = -1;
         String master2_binddn = "";
         String master2_bindpwd = "";
+        String master2_replicationpwd = "";
 
         try {
             master2_hostname = cs.getString("internaldb.ldapconn.host", "");
             master2_port = cs.getInteger("internaldb.ldapconn.port", -1);
             master2_binddn = cs.getString("internaldb.ldapauth.bindDN", "");
             master2_bindpwd = bindpwd;
+            master2_replicationpwd = cs.getString("preop.internaldb.replicationpwd", "");
         } catch (Exception e) {
         }
   
@@ -1062,8 +1072,8 @@ public class DatabasePanel extends WizardPanelBase {
             String replicadn = "cn=replica,cn=\""+suffix+"\",cn=mapping tree,cn=config";
             CMS.debug("DatabasePanel setupReplication: replicadn="+replicadn);
 
-            createReplicationManager(conn1, master1_bindpwd);
-            createReplicationManager(conn2, master2_bindpwd);
+            createReplicationManager(conn1, master1_replicationpwd);
+            createReplicationManager(conn2, master2_replicationpwd);
 
             String dir1 = getInstanceDir(conn1);
             createChangeLog(conn1, dir1 + "/changelogs");
@@ -1077,10 +1087,10 @@ public class DatabasePanel extends WizardPanelBase {
             CMS.debug("DatabasePanel setupReplication: Finished enabling replication");
 
             createReplicationAgreement(replicadn, conn1, masterAgreementName, 
-              master2_hostname, master2_port, master2_bindpwd, basedn);
+              master2_hostname, master2_port, master2_replicationpwd, basedn);
 
             createReplicationAgreement(replicadn, conn2, cloneAgreementName, 
-              master1_hostname, master1_port, master1_bindpwd, basedn);
+              master1_hostname, master1_port, master1_replicationpwd, basedn);
 
             // initialize consumer
             initializeConsumer(replicadn, conn1, masterAgreementName);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
index a4a0687a1..f6cd67e32 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
@@ -42,6 +42,7 @@ import java.io.*;
 import java.math.*;
 import java.security.cert.*;
 import org.w3c.dom.*;
+import java.util.*;
 
 import com.netscape.cms.servlet.wizard.*;
 
@@ -307,8 +308,8 @@ public class DonePanel extends WizardPanelBase {
                 updateDomainXML(sd_host, p, true, "/ca/agent/ca/updateDomainXML", 
                   "list="+s+"&type="+type+"&host="+ownhost+"&name="+subsystemName+"&sport="+ownsport+"&dm=false"+cloneStr);
             } catch (Exception e) {
-                context.put("errorString", "Failed to update the domain.xml.");
-                return;
+                context.put("errorString", "Failed to update the security domain on the domain master.");
+                //return;
             }
         }
 
@@ -406,9 +407,28 @@ public class DonePanel extends WizardPanelBase {
         }
 
         cs.putInteger("cs.state", 1);
-        cs.removeSubStore("preop");
         try {
+            // save variables needed for cloning and remove preop
+            String list = cs.getString("preop.cert.list", "");
+            StringTokenizer st = new StringTokenizer(list, ",");
+
+            while (st.hasMoreTokens()) {
+                String ss = st.nextToken();
+                if (s.equals("sslserver"))
+                    continue;
+                cs.putString("cloning." + ss + ".nickname", cs.getString("preop.cert." + ss + ".nickname", ""));
+                cs.putString("cloning." + ss + ".dn", cs.getString("preop.cert." + ss + ".dn", ""));
+                cs.putString("cloning." + ss + ".keytype", cs.getString("preop.cert." + ss + ".keytype", ""));
+                cs.putString("cloning." + ss + ".privkey.id", cs.getString("preop.cert." + ss + ".privkey.id", ""));
+                cs.putString("cloning." + ss + ".pubkey.exponent", cs.getString("preop.cert." + ss + ".pubkey.exponent", ""));
+                cs.putString("cloning." + ss + ".pubkey.modulus", cs.getString("preop.cert." + ss + ".pubkey.modulus", ""));
+            }
+            cs.putString("cloning.module.token", cs.getString("preop.module.token", ""));
+            cs.putString("cloning.list", list);
+
+            cs.removeSubStore("preop");
             cs.commit(false);
+
         } catch (Exception e) {
         }
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
index 6b1fd1e99..c47bfdc1c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
@@ -156,7 +156,9 @@ public class GetConfigEntries extends CMSServlet {
                 } catch (Exception ee) {
                     if (name.equals("internaldb.ldapauth.password")) {
                         value = getLDAPPassword();
-                    } else
+                    } else if (name.equals("internaldb.replication.password")) {
+                        value = getReplicationPassword();
+                    } else 
                         continue;
                 }
              
@@ -200,4 +202,10 @@ public class GetConfigEntries extends CMSServlet {
         IPasswordStore pwdStore = CMS.getPasswordStore();
         return pwdStore.getPassword("internaldb");
     }
+
+    private String getReplicationPassword() {
+        IPasswordStore pwdStore = CMS.getPasswordStore();
+        return pwdStore.getPassword("replicationdb");
+    }
+
 }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
index 47b8bd3f9..442826c42 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
@@ -81,7 +81,7 @@ public class GetTokenInfo extends CMSServlet {
 
         String certlist = "";
         try {
-            certlist = config.getString("preop.cert.list");
+            certlist = config.getString("cloning.list");
         } catch (Exception e) {
         }
 
@@ -90,7 +90,7 @@ public class GetTokenInfo extends CMSServlet {
             String name = t1.nextToken();
             if (name.equals("sslserver"))
                 continue;
-            name = "preop.cert."+name+".nickname";
+            name = "cloning."+name+".nickname";
             String value = "";
 
             try {
@@ -105,7 +105,7 @@ public class GetTokenInfo extends CMSServlet {
         }
 
         String value = "";
-        String name = "preop.module.token";
+        String name = "cloning.module.token";
         try {
             value = config.getString(name);
         } catch (Exception e) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
index 732adf8f5..ef08b05cd 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
@@ -100,12 +100,6 @@ public class ImportAdminCertPanel extends WizardPanelBase {
 
         IConfigStore cs = CMS.getConfigStore();
 
-        String s = "";
-        try {
-            s = cs.getString("preop.subsystem.select", "");
-        } catch (Exception e) {
-        }
-
         String type = "";
         String subsystemtype = "";
 
@@ -114,11 +108,6 @@ public class ImportAdminCertPanel extends WizardPanelBase {
             subsystemtype = cs.getString("cs.type", "");
         } catch (Exception e) {}
 
-        if (s.equals("clone")) {
-            context.put("import", "false");
-            return;
-        }
-
         try {
             String serialno = cs.getString("preop.admincert.serialno.0");
             
@@ -183,13 +172,6 @@ public class ImportAdminCertPanel extends WizardPanelBase {
             Context context) throws IOException {
         IConfigStore cs = CMS.getConfigStore();
 
-        String select = "";
-        try {
-            select = cs.getString("preop.subsystem.select", "");
-            context.put("select", select);
-        } catch (Exception e) {
-        }
-
         String type = "";
         String subsystemtype = "";
 
@@ -198,9 +180,6 @@ public class ImportAdminCertPanel extends WizardPanelBase {
             subsystemtype = cs.getString("cs.type", "");
         } catch (Exception e) {}
 
-        if (select.equals("clone"))
-            return;
-
         ICertificateAuthority ca = (ICertificateAuthority) CMS.getSubsystem(
                 ICertificateAuthority.ID);
 
@@ -284,6 +263,20 @@ public class ImportAdminCertPanel extends WizardPanelBase {
         context.put("panel", "admin/console/config/importadmincertpanel.vm");
     }
 
+    public boolean shouldSkip() {
+        try {
+            IConfigStore c = CMS.getConfigStore();
+            String s = c.getString("preop.subsystem.select",null);
+            if (s != null && s.equals("clone")) {
+                return true;
+            }
+        } catch (EBaseException e) {
+        }
+
+        return false;
+    }
+
+
     /**
      * If validiate() returns false, this method will be called.
      */
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
index bf0be9b6e..dbbe90d27 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
@@ -386,22 +386,22 @@ public class RestoreKeyCertPanel extends WizardPanelBase {
                     if (t1.equals("sslserver"))
                         continue;
                     c1.append(",");
-                    c1.append("preop.cert.");
+                    c1.append("cloning.");
                     c1.append(t1);
                     c1.append(".nickname,");
-                    c1.append("preop.cert.");
+                    c1.append("cloning.");
                     c1.append(t1);
                     c1.append(".dn,");
-                    c1.append("preop.cert.");
+                    c1.append("cloning.");
                     c1.append(t1);
                     c1.append(".keytype,");
-                    c1.append("preop.cert.");
+                    c1.append("cloning.");
                     c1.append(t1);
                     c1.append(".privkey.id,");
-                    c1.append("preop.cert.");
+                    c1.append("cloning.");
                     c1.append(t1);
                     c1.append(".pubkey.exponent,");
-                    c1.append("preop.cert.");
+                    c1.append("cloning.");
                     c1.append(t1);
                     c1.append(".pubkey.modulus");
 
@@ -417,7 +417,7 @@ public class RestoreKeyCertPanel extends WizardPanelBase {
                     c1.append(",preop.ca.hostname,preop.ca.httpport,preop.ca.httpsport,preop.ca.list,preop.ca.pkcs7,preop.ca.type");
                 }
 
-                content = "op=get&names=preop.module.token,instanceId,internaldb.basedn,internaldb.ldapauth.password,internaldb.ldapconn.host,internaldb.ldapconn.port,internaldb.ldapauth.bindDN"+c1.toString()+"&substores="+s1.toString()+"&xmlOutput=true&sessionID="+session_id;
+                content = "op=get&names=cloning.token,instanceId,internaldb.basedn,internaldb.ldapauth.password,internaldb.replication.password,internaldb.ldapconn.host,internaldb.ldapconn.port,internaldb.ldapauth.bindDN"+c1.toString()+"&substores="+s1.toString()+"&xmlOutput=true&sessionID="+session_id;
                 boolean success = updateConfigEntries(master_hostname, master_port, true,
                   "/"+cstype+"/admin/"+cstype+"/getConfigEntries", content, config, response);
                 if (!success) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
index 09771b3ca..c6c786f55 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
@@ -546,26 +546,31 @@ public class WizardPanelBase implements IWizardPanel {
                             config.putString("preop.internaldb.master.basedn", v); 
                         } else if (name.equals("internaldb.ldapauth.password")) {
                             config.putString("preop.internaldb.master.bindpwd", v);
+                        } else if (name.equals("internaldb.replication.password")) {
+                            config.putString("preop.internaldb.master.replicationpwd", v);
                         } else if (name.equals("instanceId")) {
                             config.putString("preop.master.instanceId", v);
-                        } else if (name.equals("preop.cert.signing.nickname")) {
+                        } else if (name.equals("cloning.cert.signing.nickname")) {
                             config.putString("preop.master.signing.nickname", v);
-                            config.putString(name, v);
-                        } else if (name.equals("preop.cert.ocsp_signing.nickname")) {
+                            config.putString("preop.cert.signing.nickname", v);
+                        } else if (name.equals("cloning.ocsp_signing.nickname")) {
                             config.putString("preop.master.ocsp_signing.nickname", v);
-                            config.putString(name, v);
-                        } else if (name.equals("preop.cert.subsystem.nickname")) {
+                            config.putString("preop.cert.ocsp_signing.nickname", v);
+                        } else if (name.equals("cloning.subsystem.nickname")) {
                             config.putString("preop.master.subsystem.nickname", v);
-                            config.putString(name, v);
-                        } else if (name.equals("preop.cert.transport.nickname")) {
+                            config.putString("preop.cert.subsystem.nickname", v);
+                        } else if (name.equals("cloning.transport.nickname")) {
                             config.putString("preop.master.transport.nickname", v);
                             config.putString("kra.transportUnit.nickName", v);
-                            config.putString(name, v);
-                        } else if (name.equals("preop.cert.storage.nickname")) {
+                            config.putString("preop.cert.transport.nickname", v);
+                        } else if (name.equals("cloning.storage.nickname")) {
                             config.putString("preop.master.storage.nickname", v);
                             config.putString("kra.storageUnit.nickName", v);
-                            config.putString(name, v);
-                        } else {
+                            config.putString("preop.cert.storage.nickname", v);
+                        } else if (name.startsWith("cloning")) {
+                            config.putString(name.replaceFirst("cloning", "preop.cert"), v);
+                        }
+                        else {
                             config.putString(name, v);
                         }
                     }
@@ -1054,22 +1059,25 @@ public class WizardPanelBase implements IWizardPanel {
                                 break;    
                             }
                         }
-                        if (name.equals("preop.cert.signing.nickname")) {                            config.putString("preop.master.signing.nickname", v);
+                        if (name.equals("cloning.signing.nickname")) {                            
+                            config.putString("preop.master.signing.nickname", v);
                             config.putString(name, v);
-                        } else if (name.equals("preop.cert.ocsp_signing.nickname")) {
+                        } else if (name.equals("cloning.ocsp_signing.nickname")) {
                             config.putString("preop.master.ocsp_signing.nickname", v);
                             config.putString(name, v);
-                        } else if (name.equals("preop.cert.subsystem.nickname")) {
+                        } else if (name.equals("cloning.subsystem.nickname")) {
                             config.putString("preop.master.subsystem.nickname", v);
                             config.putString(name, v);
-                        } else if (name.equals("preop.cert.transport.nickname")) {
+                        } else if (name.equals("cloning.cert.transport.nickname")) {
                             config.putString("preop.master.transport.nickname", v);
                             config.putString("kra.transportUnit.nickName", v);
                             config.putString(name, v);
-                        } else if (name.equals("preop.cert.storage.nickname")) {
+                        } else if (name.equals("cloning.cert.storage.nickname")) {
                             config.putString("preop.master.storage.nickname", v);
                             config.putString("kra.storageUnit.nickName", v);
                             config.putString(name, v);
+                        } else if (name.equals("cloning.module.token")) {
+                            config.putString("preop.module.token", v);
                         } else {
                             config.putString(name, v);
                         }
diff --git a/pki/linux/common-ui/pki-common-ui.spec b/pki/linux/common-ui/pki-common-ui.spec
index 536c9908c..504ef385f 100644
--- a/pki/linux/common-ui/pki-common-ui.spec
+++ b/pki/linux/common-ui/pki-common-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      3
+%define base_release      4
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -221,6 +221,8 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Mon Oct 27 2008 alee <alee@redhat.com> 1.0.0-4
+- Fix for Bug# 223324.
 * Wed Sep 24 2008 alee <alee@redhat.com> 1.0.0-3
 - Fix for Bug# 223367 and 224902.
 * Fri May 03 2008 jmagne <jmagne@redhat.com> 1.0.0-2
diff --git a/pki/linux/common-ui/shared/admin/console/config/adminpanel.vm b/pki/linux/common-ui/shared/admin/console/config/adminpanel.vm
index 36e99097b..60af2a530 100644
--- a/pki/linux/common-ui/shared/admin/console/config/adminpanel.vm
+++ b/pki/linux/common-ui/shared/admin/console/config/adminpanel.vm
@@ -21,7 +21,6 @@ function myOnLoad() {
 }
 
 function performPanel() {
-#if ($import == 'true' && $clone != 'clone')
     var email = document.forms[0].email.value;
     var name = document.forms[0].name.value;
     var o = '$securityDomain';
@@ -46,11 +45,6 @@ function performPanel() {
     } else {
         Send_OnClick();
     }
-#else
-    with (document.forms[0]) {
-        submit();
-    }
-#end
 }
 
 function setCRMFRequest()
@@ -183,51 +177,30 @@ The administrator is a privileged user who manages this subsystem. Please enter
     <table class="details">
       <tr>
         <th>UID:</th>
-#if ($clone != 'clone')
         <td><input type=text name=uid value="$admin_uid"></td>
-#else
-        <td><input type=text name=uid value="$admin_uid" disabled="disabled"></td>
-#end
       </tr>
       <tr>
         <th>Name:</th>
-#if ($clone != 'clone')
         <td><input size=35 type=text name=name value="$admin_name"></td>
-#else
-        <td><input size=35 type=text name=name value="$admin_name" disabled="disabled"></td>
-#end
       </tr>
       <tr>
         <th>Email:</th>
-#if ($clone != 'clone')
         <td><input size=35 type=text name=email value="$admin_email"></td>
-#else
-        <td><input size=35 type=text name=email value="$admin_email" disabled="disabled"></td>
-#end
       </tr>
       <tr>
         <th>Password:</th>
-#if ($clone != 'clone')
         <td><input type="password" size="40" name="__pwd" value="$admin_pwd" autocomplete="off"/></td>
-#else
-        <td><input type="password" size="40" name="__pwd" value="$admin_pwd" disabled="disabled" autocomplete="off"/></td>
-#end
       </tr>
       <tr>
         <th>Password (Again):</th>
                                                                               
-#if ($clone != 'clone')
         <td><input type="password" size="40" name="__admin_password_again" value="$admin_pwd_again" autocomplete="off"/></td>
-#else
-        <td><input type="password" size="40" name="__admin_password_again" value="$admin_pwd_again" disabled="disabled" autocomplete="off"/></td>
-#end
 <input type="hidden" name="cert_request" value=""/>
 <input type="hidden" name="display" value=$displayStr />
 <input type="hidden" name="profileId" value="caAdminCert" />
 <input type="hidden" name="cert_request_type" value="crmf" />
 <input type="hidden" name="import" value=$import />
 <input type="hidden" name="uid" value="admin" />
-<input type="hidden" name="clone" value=$clone />
 <input type="hidden" name="securitydomain" value="$securityDomain" />
 <input type="hidden" name="subject" value="cn=x" />
       </tr>
diff --git a/pki/linux/common/pki-common.spec b/pki/linux/common/pki-common.spec
index 6137fd5fe..016fe171d 100644
--- a/pki/linux/common/pki-common.spec
+++ b/pki/linux/common/pki-common.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      24
+%define base_release      25
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -298,6 +298,8 @@ chmod 00755 %{_datadir}/%{base_prefix}/setup/postinstall
 ###############################################################################
 
 %changelog
+* Mon Oct 27 2008 Ade Lee <alee@redhat.com> 1.0.0-25
+- Fix for Bugs: 223324, 430745, 224765, 223309
 * Fri Oct 17 2008 Andrew Wnuk <awnuk@redhat.com> 1.0.0-24
 - Fix for Bug 335111: pkiconsole exception on wrong uniqueMember syntax
 * Wed Oct 15 2008 Andrew Wnuk <awnuk@redhat.com> 1.0.0-23