diff options
author | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-01-28 16:07:09 +0000 |
---|---|---|
committer | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-01-28 16:07:09 +0000 |
commit | 13715dc6c17c55dd36a6c6bfe8ad12a775f5bc50 (patch) | |
tree | 8349ad5e86fbea80e011af53d56518dea76bf11e /pki/base/common/src/com | |
parent | ea85f54a756ff1e6603cdee28a90785b3f8db08d (diff) | |
download | pki-13715dc6c17c55dd36a6c6bfe8ad12a775f5bc50.tar.gz pki-13715dc6c17c55dd36a6c6bfe8ad12a775f5bc50.tar.xz pki-13715dc6c17c55dd36a6c6bfe8ad12a775f5bc50.zip |
Bugzilla BZ# 482738: selinux changes for cloning
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@199 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/common/src/com')
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java | 5 | ||||
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java | 3 |
2 files changed, 7 insertions, 1 deletions
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 0cb7feba6..91bd2a278 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 @@ -207,14 +207,17 @@ public class RestoreKeyCertPanel extends WizardPanelBase { String pwd = HttpInput.getPassword(request, "password"); String tokenn = ""; + String instanceRoot = ""; + try { tokenn = config.getString("preop.module.token"); + instanceRoot = config.getString("instanceRoot"); } catch (Exception e) { } if (tokenn.equals("Internal Key Storage Token")) { byte b[] = new byte[1000000]; - FileInputStream fis = new FileInputStream(path); + FileInputStream fis = new FileInputStream(instanceRoot + "/alias/" + path); while (fis.available() > 0) fis.read(b); fis.close(); 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 be00bd73c..22472239b 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 @@ -567,6 +567,9 @@ public class WizardPanelBase implements IWizardPanel { config.putString("preop.master.storage.nickname", v); config.putString("kra.storageUnit.nickName", v); config.putString("preop.cert.storage.nickname", v); + } else if (name.equals("cloning.audit_signing.nickname")) { + config.putString("preop.master.audit_signing.nickname", v); + config.putString(name, v); } else if (name.startsWith("cloning")) { config.putString(name.replaceFirst("cloning", "preop.cert"), v); } |