From 53958a1be28be6f5bedaaefda5aed6b5a6cd5d29 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 30 Nov 2009 12:03:50 +0000
Subject: [PATCH] Complete fix for issue 4371 (setup throws NullPointerException when trying to use a PKCS12 certificate) With these changes, the default server certificate nick name is used when the user decides to use a self-signed certificate.

---
 opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 38190c8..805d43e 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -182,9 +182,10 @@
       "org.opends.server.extensions.ConfigFileHandler";
 
   /** Alias of a self-signed certificate. */
-  protected static final String SELF_SIGNED_CERT_ALIAS = "server-cert";
+  protected static final String SELF_SIGNED_CERT_ALIAS =
+    SecurityOptions.SELF_SIGNED_CERT_ALIAS;
 
-  /** The thresold in minutes used to know whether we must display a warning
+  /** The threshold in minutes used to know whether we must display a warning
    * informing that there is a server clock difference between two servers
    * whose contents are being replicated. */
   public static final int WARNING_CLOCK_DIFFERENCE_THRESOLD_MINUTES = 5;

--
Gitblit v1.10.0