X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdapUserAdmin.java;h=ef212fa27a0160629a592af1c578630699941fbc;hb=268e023a9de5db2549431a4415e584ac68a4f98b;hp=0c6d2937649431414be31b615d91b04b8837c4eb;hpb=ddc39c1b3948757c83c9a89853b0ede87f46ddea;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 0c6d29376..ef212fa27 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
@@ -24,7 +24,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.osgi.framework.Filter;
-import org.osgi.service.useradmin.User;
 
 /**
  * A user admin based on a LDAP server. Requires a {@link TransactionManager}
@@ -157,12 +156,12 @@ public class LdapUserAdmin extends AbstractUserDirectory {
 	}
 
 	@Override
-	protected List<DirectoryGroup> getDirectGroups(User user) {
-		List<DirectoryGroup> directGroups = new ArrayList<DirectoryGroup>();
+	protected List<LdapName> getDirectGroups(LdapName dn) {
+		List<LdapName> directGroups = new ArrayList<LdapName>();
 		try {
 			String searchFilter = "(&(" + objectClass + "="
 					+ getGroupObjectClass() + ")(" + getMemberAttributeId()
-					+ "=" + user.getName() + "))";
+					+ "=" + dn + "))";
 
 			SearchControls searchControls = new SearchControls();
 			searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
@@ -174,14 +173,12 @@ public class LdapUserAdmin extends AbstractUserDirectory {
 			while (results.hasMoreElements()) {
 				SearchResult searchResult = (SearchResult) results
 						.nextElement();
-				LdifGroup group = new LdifGroup(this, toDn(searchBase,
-						searchResult), searchResult.getAttributes());
-				directGroups.add(group);
+				directGroups.add(toDn(searchBase, searchResult));
 			}
 			return directGroups;
 		} catch (Exception e) {
-			throw new ArgeoException("Cannot populate direct members of "
-					+ user, e);
+			throw new ArgeoException("Cannot populate direct members of " + dn,
+					e);
 		}
 	}