Bug 542863 - RHCS8: Default cert audit nickname written to CS.cfg files imcomplete when the cert is stored on a hsm

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

1 files changed, 20 insertions, 0 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
index 78c9837c2..98c663b1e 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
@@ -353,6 +353,17 @@ public class NamePanel extends WizardPanelBase {
                 // parameters already set
             }
         }
+
+        // audit signing cert
+        String audit_nn = config.getString(cstype + ".audit_signing" + ".nickname", "");
+        String audit_tk = config.getString(cstype + ".audit_signing" + ".tokenname", "");
+	    if (!audit_tk.equals("Internal Key Storage Token") && !audit_tk.equals("")) {
+            config.putString("log.instance.SignedAudit.signedAuditCertNickname",
+                audit_tk + ":" + audit_nn);
+        } else {
+            config.putString("log.instance.SignedAudit.signedAuditCertNickname",
+                audit_nn);
+        }
     }
 
     /*
@@ -408,6 +419,15 @@ public class NamePanel extends WizardPanelBase {
 
         config.putString(subsystem + "." + certTag + ".nickname", nickname);
         config.putString(subsystem + "." + certTag + ".tokenname", token);
+        if (certTag.equals("audit_signing")) {
+	      if (!token.equals("Internal Key Storage Token") && !token.equals("")) {
+            config.putString("log.instance.SignedAudit.signedAuditCertNickname",
+                token + ":" + nickname);
+          } else {
+            config.putString("log.instance.SignedAudit.signedAuditCertNickname",
+                nickname);
+          }
+        }
         /*
         config.putString(CERT_PREFIX + certTag + ".defaultSigningAlgorithm",
                 "SHA1withRSA");