X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdapUserAdmin.java;fp=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdapUserAdmin.java;h=838486b6de609324e27dd81691aef65987605021;hb=25e98954db6faeec4ba9950f651e81fbea595b0c;hp=1dc4df981840e0608a8e89c5006cb9a9ec6d4afe;hpb=6bd449f839949c0ebc7eafdd9c9997dc10850db0;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdapUserAdmin.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
index 1dc4df981..838486b6d 100644
--- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
+++ b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
@@ -42,7 +42,7 @@ public class LdapUserAdmin extends AbstractUserDirectory {
 					"com.sun.jndi.ldap.LdapCtxFactory");
 			connEnv.put(Context.PROVIDER_URL, getUri().toString());
 			connEnv.put("java.naming.ldap.attributes.binary",
-					LdifName.userpassword.name());
+					LdifName.userPassword.name());
 
 			initialLdapContext = new InitialLdapContext(connEnv, null);
 			// StartTlsResponse tls = (StartTlsResponse) ctx
@@ -111,7 +111,6 @@ public class LdapUserAdmin extends AbstractUserDirectory {
 
 	@Override
 	protected List<DirectoryUser> doGetRoles(Filter f) {
-		// TODO Auto-generated method stub
 		try {
 			String searchFilter = f != null ? f.toString() : "(|("
 					+ objectClass + "=" + getUserObjectClass() + ")("
@@ -127,15 +126,14 @@ public class LdapUserAdmin extends AbstractUserDirectory {
 			while (results.hasMoreElements()) {
 				SearchResult searchResult = results.next();
 				Attributes attrs = searchResult.getAttributes();
+				LdapName dn = toDn(searchBase, searchResult);
 				LdifUser role;
 				if (attrs.get(objectClass.name()).contains(
 						getGroupObjectClass()))
-					role = new LdifGroup(this, toDn(searchBase, searchResult),
-							attrs);
+					role = new LdifGroup(this, dn, attrs);
 				else if (attrs.get(objectClass.name()).contains(
 						getUserObjectClass()))
-					role = new LdifUser(this, toDn(searchBase, searchResult),
-							attrs);
+					role = new LdifUser(this, dn, attrs);
 				else
 					throw new UserDirectoryException(
 							"Unsupported LDAP type for "