Bug# 498123, format token problem with cloned tks.

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

10 files changed, 30 insertions, 10 deletions

diff --git a/pki/base/ca/shared/conf/CS.cfg b/pki/base/ca/shared/conf/CS.cfg
index 0cfffcf1..d64d65ac 100644
--- a/pki/base/ca/shared/conf/CS.cfg
+++ b/pki/base/ca/shared/conf/CS.cfg
@@ -704,7 +704,8 @@ internaldb.ldapauth.clientCertNickname=
 internaldb.ldapconn.host=
 internaldb.ldapconn.port=
 internaldb.ldapconn.secureConn=false
-preop.internaldb.ldif=/usr/share/[PKI_FLAVOR]/ca/conf/schema.ldif,/usr/share/[PKI_FLAVOR]/ca/conf/database.ldif
+preop.internaldb.schema.ldif=/usr/share/[PKI_FLAVOR]/ca/conf/schema.ldif
+preop.internaldb.ldif=/usr/share/[PKI_FLAVOR]/ca/conf/database.ldif
 preop.internaldb.data_ldif=/usr/share/[PKI_FLAVOR]/ca/conf/db.ldif,/usr/share/[PKI_FLAVOR]/ca/conf/acl.ldif
 preop.internaldb.index_ldif=
 preop.internaldb.post_ldif=/usr/share/[PKI_FLAVOR]/ca/conf/index.ldif,/usr/share/[PKI_FLAVOR]/ca/conf/vlv.ldif,/usr/share/[PKI_FLAVOR]/ca/conf/vlvtasks.ldif
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 11c41d99..1c71780d 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
@@ -684,13 +684,19 @@ public class DatabasePanel extends WizardPanelBase {
         } catch (Exception e) {
         }
 
-        importLDIFS("preop.internaldb.ldif", conn);
         if (select.equals("clone")) {
           // if this is clone, add index before replication
+          // don't put in the schema or bad things will happen
+          
+          importLDIFS("preop.internaldb.ldif", conn);
           importLDIFS("preop.internaldb.index_ldif", conn);
         } else {
           // data will be replicated from the master to the clone
           // so clone does not need the data
+          //
+
+          importLDIFS("preop.internaldb.schema.ldif", conn);         
+          importLDIFS("preop.internaldb.ldif", conn); 
           importLDIFS("preop.internaldb.data_ldif", conn);
           importLDIFS("preop.internaldb.index_ldif", conn);
         }
diff --git a/pki/base/kra/shared/conf/CS.cfg b/pki/base/kra/shared/conf/CS.cfg
index a9743f80..7a147788 100644
--- a/pki/base/kra/shared/conf/CS.cfg
+++ b/pki/base/kra/shared/conf/CS.cfg
@@ -197,7 +197,8 @@ internaldb.ldapauth.clientCertNickname=
 internaldb.ldapconn.host=
 internaldb.ldapconn.port=
 internaldb.ldapconn.secureConn=false
-preop.internaldb.ldif=/usr/share/[PKI_FLAVOR]/kra/conf/schema.ldif,/usr/share/[PKI_FLAVOR]/kra/conf/database.ldif
+preop.internaldb.schema.ldif=/usr/share/[PKI_FLAVOR]/kra/conf/schema.ldif
+preop.internaldb.ldif=/usr/share/[PKI_FLAVOR]/kra/conf/database.ldif
 preop.internaldb.data_ldif=/usr/share/[PKI_FLAVOR]/kra/conf/db.ldif,/usr/share/[PKI_FLAVOR]/kra/conf/acl.ldif
 preop.internaldb.index_ldif=
 preop.internaldb.post_ldif=/usr/share/[PKI_FLAVOR]/kra/conf/index.ldif,/usr/share/[PKI_FLAVOR]/kra/conf/vlv.ldif,/usr/share/[PKI_FLAVOR]/kra/conf/vlvtasks.ldif
diff --git a/pki/base/ocsp/shared/conf/CS.cfg b/pki/base/ocsp/shared/conf/CS.cfg
index 67967cd4..e613719a 100644
--- a/pki/base/ocsp/shared/conf/CS.cfg
+++ b/pki/base/ocsp/shared/conf/CS.cfg
@@ -166,7 +166,8 @@ internaldb.ldapauth.clientCertNickname=
 internaldb.ldapconn.host=
 internaldb.ldapconn.port=
 internaldb.ldapconn.secureConn=false
-preop.internaldb.ldif=/usr/share/[PKI_FLAVOR]/ocsp/conf/schema.ldif,/usr/share/[PKI_FLAVOR]/ocsp/conf/database.ldif
+preop.internaldb.schema.ldif=/usr/share/[PKI_FLAVOR]/ocsp/conf/schema.ldif
+preop.internaldb.ldif=/usr/share/[PKI_FLAVOR]/ocsp/conf/database.ldif
 preop.internaldb.data_ldif=/usr/share/[PKI_FLAVOR]/ocsp/conf/db.ldif,/usr/share/[PKI_FLAVOR]/ocsp/conf/acl.ldif
 preop.internaldb.index_ldif=/usr/share/[PKI_FLAVOR]/ocsp/conf/index.ldif
 preop.internaldb.post_ldif=
diff --git a/pki/base/tks/shared/conf/CS.cfg b/pki/base/tks/shared/conf/CS.cfg
index 5e10c8d8..ddaf88c4 100644
--- a/pki/base/tks/shared/conf/CS.cfg
+++ b/pki/base/tks/shared/conf/CS.cfg
@@ -164,7 +164,8 @@ internaldb.ldapauth.clientCertNickname=
 internaldb.ldapconn.host=
 internaldb.ldapconn.port=
 internaldb.ldapconn.secureConn=false
-preop.internaldb.ldif=/usr/share/[PKI_FLAVOR]/tks/conf/schema.ldif,/usr/share/[PKI_FLAVOR]/tks/conf/database.ldif
+preop.internaldb.schema.ldif=/usr/share/[PKI_FLAVOR]/tks/conf/schema.ldif
+preop.internaldb.ldif=/usr/share/[PKI_FLAVOR]/tks/conf/database.ldif
 preop.internaldb.data_ldif=/usr/share/[PKI_FLAVOR]/tks/conf/db.ldif,/usr/share/[PKI_FLAVOR]/tks/conf/acl.ldif
 preop.internaldb.index_ldif=/usr/share/[PKI_FLAVOR]/tks/conf/index.ldif
 preop.internaldb.post_ldif=
diff --git a/pki/dogtag/ca/pki-ca.spec b/pki/dogtag/ca/pki-ca.spec
index e3bb3014..78251ecd 100644
--- a/pki/dogtag/ca/pki-ca.spec
+++ b/pki/dogtag/ca/pki-ca.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      18
+%define base_release      19
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -281,6 +281,8 @@ fi
 ###############################################################################
 
 %changelog
+* Thu Jun 5 2009 Jack Magne <jmagne@redhat.com> 1.1.0-19
+- Bugzilla Bug #498123 - Unable to formated token with tks clone.
 * Wed Jun 3 2009 Christina Fu <cfu@redhat.com> 1.1.0-18
 - Bugzilla Bug #455305 - CA ECC signing Key Failure
   Bugzilla Bug #223279 - ECC: Ca: unable to perform agent auth on a machine with
diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index 13b869d3..cf83b010 100644
--- a/pki/dogtag/common/pki-common.spec
+++ b/pki/dogtag/common/pki-common.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      25
+%define base_release      26
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -285,6 +285,8 @@ chmod 00755 %{_datadir}/%{base_prefix}/setup/postinstall
 ###############################################################################
 
 %changelog
+* Fri Jun 5 2009 Jack Magne <jmagne@redhat.com> 1.1.0-26
+- Bugzilla Bug #498123 - Unable to format a token with tks clone.
 * Thu Jun 4 2009 Christina Fu <cfu@redhat.com> 1.1.0-25
 - Bugzilla Bug#502861 - "Signed CMC-Authenticated User Certificate Enrollment" fails with Authorization
 * Wed Jun 3 2009 Christina Fu <cfu@redhat.com> 1.1.0-24
diff --git a/pki/dogtag/kra/pki-kra.spec b/pki/dogtag/kra/pki-kra.spec
index 64f0a921..b7710967 100644
--- a/pki/dogtag/kra/pki-kra.spec
+++ b/pki/dogtag/kra/pki-kra.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      9
+%define base_release      10
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -288,6 +288,8 @@ fi
 ###############################################################################
 
 %changelog
+* Thu Jun 5 2009 Jack Magne <jmagne@redhat.com> 1.1.0-10
+- Bugzilla Bug #498123 - Unable to formated token with tks clone.
 * Mon Jun 1 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-9
 - Bugzilla Bug #503255 -  Fix confusing "Security Domain" message when using 
   "status"
diff --git a/pki/dogtag/ocsp/pki-ocsp.spec b/pki/dogtag/ocsp/pki-ocsp.spec
index 11642247..7e87c3cb 100644
--- a/pki/dogtag/ocsp/pki-ocsp.spec
+++ b/pki/dogtag/ocsp/pki-ocsp.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      9
+%define base_release      10
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -297,6 +297,8 @@ fi
 ###############################################################################
 
 %changelog
+* Thu Jun 5 2009 Jack Magne <jmagne@redhat.com> 1.1.0-10
+- Bugzilla Bug #498123 - Unable to formated token with tks clone.
 * Mon Jun 1 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-9
 - Bugzilla Bug #503255 -  Fix confusing "Security Domain" message when using 
   "status"
diff --git a/pki/dogtag/tks/pki-tks.spec b/pki/dogtag/tks/pki-tks.spec
index 32d4039f..9046c4bb 100644
--- a/pki/dogtag/tks/pki-tks.spec
+++ b/pki/dogtag/tks/pki-tks.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      9
+%define base_release      10
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -290,6 +290,8 @@ fi
 ###############################################################################
 
 %changelog
+* Thu Jun 5 2009 Jack Magne <jmagne@redhat.com> 1.1.0-10
+- Bugzilla Bug #498123 - Unable to formated token with tks clone.
 * Mon Jun 1 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-9
 - Bugzilla Bug #503255 -  Fix confusing "Security Domain" message when using 
   "status"