[jboss-cvs] Picketbox SVN: r399 - branches/4.0.9.Final-bz-914821/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi.

[jboss-cvs-commits at lists.jboss.org]

Author: dehort
Date: 2013-03-28 23:02:41 -0400 (Thu, 28 Mar 2013)
New Revision: 399

Modified:
   branches/4.0.9.Final-bz-914821/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java
Log:
[bz-914821]


Modified: branches/4.0.9.Final-bz-914821/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java
===================================================================
--- branches/4.0.9.Final-bz-914821/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java	2013-03-27 20:05:14 UTC (rev 398)
+++ branches/4.0.9.Final-bz-914821/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java	2013-03-29 03:02:41 UTC (rev 399)
@@ -440,7 +440,7 @@
          // Query for roles matching the role filter
          SearchControls constraints = new SearchControls();
          constraints.setSearchScope(searchScope);
-         constraints.setReturningAttributes(new String[0]);
+         //constraints.setReturningAttributes(new String[0]);
          constraints.setTimeLimit(searchTimeLimit);
          rolesSearch(ctx, constraints, username, userDN, recursion, 0);
       }
@@ -582,8 +582,9 @@
                   else
                   {
                      // Check the top context for role names
-                     String[] attrNames = {roleNameAttributeID};
-                     Attributes result2 = ldapCtx.getAttributes(dn, attrNames);
+                     //String[] attrNames = {roleNameAttributeID};
+                     //Attributes result2 = ldapCtx.getAttributes(dn, attrNames);
+                     Attributes result2 = sr.getAttributes();
                      Attribute roles2 = result2.get(roleNameAttributeID);
                      if( roles2 != null )
                      {