[jboss-cvs] JBossAS SVN: r97693 - branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/auth/spi.

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

Author: mmoyses
Date: 2009-12-10 08:22:40 -0500 (Thu, 10 Dec 2009)
New Revision: 97693

Modified:
   branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java
Log:
JBPAPP-3246: fix problem with empty baseCtxDN and roleCtxDN

Modified: branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java	2009-12-10 12:47:55 UTC (rev 97692)
+++ branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java	2009-12-10 13:22:40 UTC (rev 97693)
@@ -422,7 +422,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);
 
@@ -598,15 +598,15 @@
       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;
    }