X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FDirectoryUserAdmin.java;h=8ed23ad2ec92d747c66b3ba395ddb80844b525fa;hb=285c23f26c4d634cd139d393ebcb708187d5e960;hp=003aad11d8e1e6ea6e3ab9212b3c38db061755e9;hpb=4012bedd8870634488b307d2233590fb1226e5d4;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUserAdmin.java b/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUserAdmin.java
index 003aad11d..8ed23ad2e 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUserAdmin.java
+++ b/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUserAdmin.java
@@ -346,13 +346,13 @@ public class DirectoryUserAdmin extends AbstractLdapDirectory implements UserAdm
 			return getRole(name);
 		} else {
 			wc.getModifiedData().put(dn, attrs);
-			LdapEntry newRole = newRole(dn, type, attrs);
+			LdapEntry newRole = doCreateRole(dn, type, attrs);
 			wc.getNewData().put(dn, newRole);
 			return (Role) newRole;
 		}
 	}
 
-	protected LdapEntry newRole(LdapName dn, int type, Attributes attrs) {
+	private LdapEntry doCreateRole(LdapName dn, int type, Attributes attrs) {
 		LdapEntry newRole;
 		BasicAttribute objClass = new BasicAttribute(objectClass.name());
 		if (type == Role.USER) {
@@ -367,14 +367,14 @@ public class DirectoryUserAdmin extends AbstractLdapDirectory implements UserAdm
 			objClass.add(top.name());
 			objClass.add(extensibleObject.name());
 			attrs.put(objClass);
-			newRole = newUser(dn, attrs);
+			newRole = newUser(dn);
 		} else if (type == Role.GROUP) {
 			String groupObjClass = getGroupObjectClass();
 			objClass.add(groupObjClass);
 			// objClass.add(LdifName.extensibleObject.name());
 			objClass.add(top.name());
 			attrs.put(objClass);
-			newRole = newGroup(dn, attrs);
+			newRole = newGroup(dn);
 		} else
 			throw new IllegalArgumentException("Unsupported type " + type);
 		return newRole;
@@ -416,7 +416,7 @@ public class DirectoryUserAdmin extends AbstractLdapDirectory implements UserAdm
 
 	@Override
 	public Iterable<? extends Role> getHierarchyUnitRoles(HierarchyUnit hierarchyUnit, String filter, boolean deep) {
-		LdapName dn = LdapNameUtils.toLdapName(hierarchyUnit.getContext());
+		LdapName dn = LdapNameUtils.toLdapName(hierarchyUnit.getBase());
 		try {
 			return getRoles(dn, filter, deep);
 		} catch (InvalidSyntaxException e) {
@@ -427,13 +427,13 @@ public class DirectoryUserAdmin extends AbstractLdapDirectory implements UserAdm
 	/*
 	 * ROLES CREATION
 	 */
-	protected LdapEntry newUser(LdapName name, Attributes attrs) {
+	protected LdapEntry newUser(LdapName name) {
 		// TODO support devices, applications, etc.
-		return new LdifUser(this, name, attrs);
+		return new LdifUser(this, name);
 	}
 
-	protected LdapEntry newGroup(LdapName name, Attributes attrs) {
-		return new LdifGroup(this, name, attrs);
+	protected LdapEntry newGroup(LdapName name) {
+		return new LdifGroup(this, name);
 
 	}