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);
}
}
@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);