BZ601299: tps installation does not update security domain

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

2 files changed, 12 insertions, 3 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
index f5b0afb8d..b379a7899 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
@@ -294,7 +294,14 @@ public class UpdateDomainXML extends CMSServlet {
             ILdapConnFactory connFactory = null;
             LDAPConnection conn = null;
             String listName = type + "List";
-            String cn = host + ":" + adminsport;
+            String cn = host + ":";
+
+            if ((adminsport!= null) && (adminsport != "")) {
+                cn += adminsport;
+            } else {
+                cn += sport;
+            }
+
             String dn = "cn=" + cn + ",cn=" + listName + ",ou=Security Domain," + basedn;
             CMS.debug("UpdateDomainXML: updating LDAP entry: " + dn);
 
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
index 268f595eb..a33e73e75 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
@@ -99,14 +99,16 @@ sub update
                  "sport=" . $securePort . "&" .
                  "dm=false"; # domain manager or not
 
-    my $cmd = `/usr/bin/sslget -d \"$instanceDir/alias\" -p \"$db_password\" -v -n \"$subCertNickName\" -r \"/ca/agent/ca/updateDomainXML?$params\" $sdom_url->host:$sdom_url->port`;
+    my $sd_host =  $sdom_url->host;
+    my $sd_agent_port = $sdom_url->port;
+    my $cmd = `/usr/bin/sslget -d \"$instanceDir/alias\" -p \"$db_password\" -v -n \"$subCertNickName\" -r \"/ca/agent/ca/updateDomainXML\" -e \"$params\" $sd_host:$sd_agent_port`;
 
     # Fetch the "updated" security domain and display it 
     &PKI::TPS::Wizard::debug_log("ImportAdminCertPanel:  Dump contents of updated Security Domain . . .");
     my $sdomainAdminURL = $::config->get("config.sdomainAdminURL");
     my $sdom_info = new URI::URL($sdomainAdminURL);
     my $nickname = $::config->get("preop.cert.sslserver.nickname");
-    my $sd_host = $sdom_info->host;
+    $sd_host = $sdom_info->host;
     my $sd_admin_port = $sdom_info->port;
     my $content = `/usr/bin/sslget -d \"$instanceDir/alias\" -p \"$db_password\" -v -n \"$nickname\" -r \"/ca/admin/ca/getDomainXML\" $sd_host:$sd_admin_port`;
     $content =~ /(\<XMLResponse\>.*\<\/XMLResponse\>)/;