diff options
Diffstat (limited to 'base/common/src/com/netscape')
| -rw-r--r-- | base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java | 2 | ||||
| -rw-r--r-- | base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java index cc8808498..50c7853df 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java @@ -719,7 +719,7 @@ public class ConfigurationUtils { IConfigStore cs = CMS.getConfigStore(); String instanceRoot = cs.getString("instanceRoot"); - FileInputStream fis = new FileInputStream(instanceRoot + "/alias/" + p12File); + FileInputStream fis = new FileInputStream(p12File); while (fis.available() > 0) fis.read(b); fis.close(); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java index 7ace274a7..243e7e839 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java @@ -17,6 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; +import java.io.File; import java.io.IOException; import javax.servlet.ServletConfig; @@ -191,7 +192,10 @@ public class RestoreKeyCertPanel extends WizardPanelBase { String tokenn = config.getString("preop.module.token"); if (tokenn.equals("Internal Key Storage Token")) { - ConfigurationUtils.restoreCertsFromP12(path, pwd); + String instanceRoot = config.getString("instanceRoot"); + String p12File = instanceRoot + File.separator + "alias" + + File.separator + path; + ConfigurationUtils.restoreCertsFromP12(p12File, pwd); } String subsystemtype = config.getString("preop.subsystem.select", ""); |