X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FOsUserDirectory.java;h=5d7e97ddeea487975ebd64609f63167a0720656d;hb=3c1cdc594d954520b14646102b366290bdad58c7;hp=466563a4d1a17bdad5a0ef2651bd944cae05b7dc;hpb=b9810eb23f4e2470952a04c07d15a523c3c61a0e;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 466563a4d..5d7e97dde 100644 --- a/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserDirectory.java +++ b/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserDirectory.java @@ -6,7 +6,6 @@ import java.util.List; import javax.naming.NameNotFoundException; import javax.naming.NamingException; import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttributes; import javax.naming.ldap.LdapName; import org.argeo.util.directory.HierarchyUnit; @@ -27,9 +26,9 @@ public class OsUserDirectory extends AbstractLdapDirectoryDao { try { osUserDn = new LdapName(LdapAttrs.uid.name() + "=" + osUsername + "," + directory.getUserBaseRdn() + "," + directory.getBaseDn()); - Attributes attributes = new BasicAttributes(); - attributes.put(LdapAttrs.uid.name(), osUsername); - osUser = newUser(osUserDn, attributes); +// Attributes attributes = new BasicAttributes(); +// attributes.put(LdapAttrs.uid.name(), osUsername); + osUser = newUser(osUserDn); } catch (NamingException e) { throw new IllegalStateException("Cannot create system user", e); } @@ -41,10 +40,15 @@ public class OsUserDirectory extends AbstractLdapDirectoryDao { } @Override - public Boolean entryExists(LdapName dn) { + public boolean entryExists(LdapName dn) { return osUserDn.equals(dn); } + @Override + public boolean checkConnection() { + return true; + } + @Override public LdapEntry doGetEntry(LdapName key) throws NameNotFoundException { if (osUserDn.equals(key)) @@ -86,13 +90,13 @@ public class OsUserDirectory extends AbstractLdapDirectoryDao { @Override public void init() { // TODO Auto-generated method stub - + } @Override public void destroy() { // TODO Auto-generated method stub - + } @Override @@ -103,5 +107,5 @@ public class OsUserDirectory extends AbstractLdapDirectoryDao { throw new IllegalStateException(name + " doe not exist in " + getDirectory().getBaseDn(), e); } } - + }