[jboss-cvs] JBossAS SVN: r97696 - projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi.

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

Author: mmoyses
Date: 2009-12-10 09:01:21 -0500 (Thu, 10 Dec 2009)
New Revision: 97696

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java
Log:
JBAS-3773: fixing problem with empty baseCtxDN and rolesCtxDN

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java	2009-12-10 13:57:34 UTC (rev 97695)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java	2009-12-10 14:01:21 UTC (rev 97696)
@@ -439,7 +439,7 @@
       String name = sr.getName();
       String userDN = null;
       if (sr.isRelative() == true)
-         userDN = name + "," + baseDN;
+         userDN = name + ("".equals(baseDN) ? "" : "," + baseDN);
       else
          throw new NamingException("Can't follow referal for authentication: " + name);
 
@@ -603,13 +603,14 @@
       String result = searchResult;
       int len = searchResult.length();
 
+      String appendRolesCtxDN = "" + ("".equals(rolesCtxDN) ? "" : "," + rolesCtxDN);
       if (searchResult.endsWith("\""))
       {
-         result = searchResult.substring(0, len - 1) + "," + rolesCtxDN + "\"";
+         result = searchResult.substring(0, len - 1) + appendRolesCtxDN + "\"";
       }
       else
       {
-         result = searchResult + "," + rolesCtxDN;
+         result = searchResult + appendRolesCtxDN;
       }
       return result;
    }