From 0f88b78b378ac39f0c9ad5d2926404497d5bf4c9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 19:04:23 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java
index cb1950c..67112d5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java
@@ -26,14 +26,13 @@
import java.util.ArrayList;
import java.util.List;
-import javax.naming.ldap.LdapName;
-import javax.naming.ldap.Rdn;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.DN;
import org.opends.server.util.Platform;
/**
@@ -364,10 +363,8 @@
boolean matches = false;
try
{
- LdapName dn =
- new LdapName(chain[0].getSubjectX500Principal().getName());
- Rdn rdn = dn.getRdn(dn.getRdns().size() - 1);
- String value = rdn.getValue().toString();
+ DN dn = DN.valueOf(chain[0].getSubjectX500Principal().getName());
+ String value = dn.rdn(dn.size() - 1).getFirstAVA().getAttributeValue().toString();
matches = hostMatch(value, host);
if (!matches)
{
--
Gitblit v1.10.0