1 files changed, 6 insertions, 1 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
index b8e1816f1..244b7df4c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
@@ -296,6 +296,7 @@ public class LDAPSecurityDomainSessionTable
         String pwd = null;
         String binddn = "";
         String security = "";
+        String clientNick = "";
 
         IPasswordStore pwdStore = CMS.getPasswordStore();
 
@@ -313,6 +314,7 @@ public class LDAPSecurityDomainSessionTable
             port = cs.getString("internaldb.ldapconn.port");
             binddn = cs.getString("internaldb.ldapauth.bindDN");
             security = cs.getString("internaldb.ldapconn.secureConn");
+            clientNick = cs.getString("internaldb.ldapauth.clientCertNickname");
         } catch (Exception e) {
             CMS.debug("SecurityDomainSessionTable: getLDAPConn" + e.toString());
             throw new IOException(
@@ -329,7 +331,10 @@ public class LDAPSecurityDomainSessionTable
         }
 
         LDAPConnection conn = null;
-        if (security.equals("true")) {
+        if (!clientNick.equals("")) {
+            CMS.debug("SecurityDomainSessionTable getLDAPConn: creating secure (SSL) client auth connection for internal ldap");
+            conn = new LDAPConnection(CMS.getLdapJssSSLSocketFactory(clientNick));
+        } else if (security.equals("true")) {
             //CMS.debug("SecurityDomainSessionTable getLDAPConn: creating secure (SSL) connection for internal ldap");
             conn = new LDAPConnection(CMS.getLdapJssSSLSocketFactory());
         } else {