From 18de53032d0ffeeaf70b5f19368f693f90163ee8 Mon Sep 17 00:00:00 2001
From: igerasim <unknown>
Date: Tue, 30 Aug 2016 18:42:31 +0300
Subject: [PATCH] 8161743: Provide proper login context Reviewed-by: ahgross,
 vinnie, xuelei

---
 .../com/sun/security/auth/module/LdapLoginModule.java      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java b/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java
index e161b0ee8..edcdfa66f 100644
--- a/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java
+++ b/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java
@@ -426,7 +426,6 @@ public class LdapLoginModule implements LoginModule {
             constraints = new SearchControls();
             constraints.setSearchScope(SearchControls.SUBTREE_SCOPE);
             constraints.setReturningAttributes(new String[0]); //return no attrs
-            constraints.setReturningObjFlag(true); // to get the full DN
         }
 
         authzIdentity = (String)options.get(AUTHZ_IDENTITY);
@@ -886,11 +885,7 @@ public class LdapLoginModule implements LoginModule {
             // (Use the first entry if more than one is returned)
             if (results.hasMore()) {
                 SearchResult entry = results.next();
-
-                // %%% - use the SearchResult.getNameInNamespace method
-                //        available in JDK 1.5 and later.
-                //        (can remove call to constraints.setReturningObjFlag)
-                userDN = ((Context)entry.getObject()).getNameInNamespace();
+                userDN = entry.getNameInNamespace();
 
                 if (debug) {
                     System.out.println("\t\t[LdapLoginModule] found entry: " +
-- 
GitLab