From 3af0b06b4cb3c16c04a705f5f0c5a8e12c92ce4d Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 12 Sep 2011 10:38:50 +0000
Subject: [PATCH] Issue OPENDJ-262: Implement pass through authentication (PTA)

---
 opends/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/opends/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java b/opends/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
index d4f332b..c212f79 100644
--- a/opends/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
+++ b/opends/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
@@ -638,15 +638,18 @@
 
           if (options.isUseSSL())
           {
-            // Obtain the configured trust manager which will be used in order
-            // to determine the trust of the remote LDAP server.
-            DN trustManagerDN = options.getTrustManagerProviderDN();
-            TrustManagerProvider<?> trustManagerProvider = DirectoryServer
-                .getTrustManagerProvider(trustManagerDN);
+            // Obtain the optional configured trust manager which will be used
+            // in order to determine the trust of the remote LDAP server.
             TrustManager[] tm = null;
-            if (trustManagerProvider != null)
+            DN trustManagerDN = options.getTrustManagerProviderDN();
+            if (trustManagerDN != null)
             {
-              tm = trustManagerProvider.getTrustManagers();
+              TrustManagerProvider<?> trustManagerProvider = DirectoryServer
+                  .getTrustManagerProvider(trustManagerDN);
+              if (trustManagerProvider != null)
+              {
+                tm = trustManagerProvider.getTrustManagers();
+              }
             }
 
             // Create the SSL context and initialize it.

--
Gitblit v1.10.0