Bugzilla Bug #500498 - CA installation wizard doesn't install administrator

cert into browser on Firefox 3.


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

6 files changed, 22 insertions, 10 deletions

diff --git a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
index 78802bc8d..0a68c9ffe 100644
--- a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
+++ b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_ui_prefix}-%{base_prefix}-%{base_component}
 %define base_version      1.1.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
@@ -222,6 +222,9 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Thu May 14 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-4
+- Bugzilla Bug #500498 -  CA installation wizard doesn't install
+  administrator cert into browser on Firefox 3
 * Fri May 8 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-3
 - Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
   port values within TPS "CS.cfg" . . .
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
index 9eb35b194..d64d4a344 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
@@ -38,12 +38,12 @@ An administrator's certificate has been created and imported into this browser.
     <table class="details">
       <tr>
 #if ($ca == 'true' && $import == 'true')
-<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/admin/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #else
 #if ($caType == 'ca' && $import == 'true')
-<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/admin/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #else
-<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/admin/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #end 
 #end
 <input type="hidden" name="serialNumber" value=$serialNumber />
diff --git a/pki/dogtag/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec
index b1212daa6..5d7dfaf66 100644
--- a/pki/dogtag/ra/pki-ra.spec
+++ b/pki/dogtag/ra/pki-ra.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      10
+%define base_release      11
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -266,6 +266,9 @@ fi
 ###############################################################################
 
 %changelog
+* Thu May 14 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-11
+- Bugzilla Bug #500498 -  CA installation wizard doesn't install
+  administrator cert into browser on Firefox 3
 * Mon May 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-10
 - Bugzilla Bug #499025 -  pki-tps and pki-ra startup script needs to loop
   on pid file availability
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index 5dbbc0df4..ca974e0ac 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_ui_prefix}-%{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      4
+%define base_release      5
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -222,6 +222,9 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Thu May 14 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-5
+- Bugzilla Bug #500498 -  CA installation wizard doesn't install
+  administrator cert into browser on Firefox 3
 * Fri May 8 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-4
 - Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
   port values within TPS "CS.cfg" . . .
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
index d6df8b567..cb8f8eb73 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
@@ -38,12 +38,12 @@ An administrator's certificate has been created and imported into this browser.
     <table class="details">
       <tr>
 #if ($ca == 'true' && $import == 'true')
-<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/admin/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #else
 #if ($caType == 'ca' && $import == 'true')
-<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/admin/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #else
-<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/admin/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #end 
 #end
 <input type="hidden" name="serialNumber" value=$serialNumber />
diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec
index a2a3b9de8..351f04623 100644
--- a/pki/dogtag/tps/pki-tps.spec
+++ b/pki/dogtag/tps/pki-tps.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      15
+%define base_release      16
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      LGPLv2 with exceptions
@@ -313,6 +313,9 @@ fi
 ###############################################################################
 
 %changelog
+* Thu May 14 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-16
+- Bugzilla Bug #500498 -  CA installation wizard doesn't install
+  administrator cert into browser on Firefox 3
 * Mon May 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-15
 - Bugzilla Bug #499025 -  pki-tps and pki-ra startup script needs to loop
   on pid file availability