X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FOsUserDirectory.java;h=b0a52626aa4cda31602e18b37ae8208804600d2e;hb=eb4324be6ac9cdff15828a21ee7d3f6ca2f19fb9;hp=fe1ca7643f1a4ecf1596beeb870e9efdc21f7a2d;hpb=9f729eeb8255a9d800ad2506735dda8cc215a135;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserDirectory.java b/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserDirectory.java
index fe1ca7643..b0a52626a 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserDirectory.java
+++ b/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserDirectory.java
@@ -11,22 +11,22 @@ import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.naming.LdapAttrs;
+import org.argeo.util.naming.LdapAttrs;
 import org.osgi.framework.Filter;
 import org.osgi.service.useradmin.User;
 
 public class OsUserDirectory extends AbstractUserDirectory {
 	private final String osUsername = System.getProperty("user.name");
 	private final LdapName osUserDn;
-	private final LdifUser osUser;
+	private final DirectoryUser osUser;
 
 	public OsUserDirectory(URI uriArg, Dictionary<String, ?> props) {
 		super(uriArg, props, false);
 		try {
-			osUserDn = new LdapName(LdapAttrs.uid.name() + "=" + osUsername + "," + getUserBase() + "," + getBaseDn());
+			osUserDn = new LdapName(LdapAttrs.uid.name() + "=" + osUsername + "," + getUserBaseRdn() + "," + getBaseDn());
 			Attributes attributes = new BasicAttributes();
 			attributes.put(LdapAttrs.uid.name(), osUsername);
-			osUser = new LdifUser(this, osUserDn, attributes);
+			osUser = newUser(osUserDn, attributes);
 		} catch (NamingException e) {
 			throw new UserDirectoryException("Cannot create system user", e);
 		}
@@ -51,7 +51,7 @@ public class OsUserDirectory extends AbstractUserDirectory {
 	}
 
 	@Override
-	protected List<DirectoryUser> doGetRoles(Filter f) {
+	protected List<DirectoryUser> doGetRoles(LdapName searchBase, Filter f, boolean deep) {
 		List<DirectoryUser> res = new ArrayList<>();
 		if (f == null || f.match(osUser.getProperties()))
 			res.add(osUser);