X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.enterprise%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdapUserAdmin.java;h=978b9a6692b24de651bd02c16a59391b4356a86d;hb=e1f70fb64c4f0d8c6bbe6cdf19e369509eb43182;hp=456342e04e35f06b432f1f7c91193d28cba85914;hpb=a2ad417ed1d0219ac29d70ae985939764c13ce38;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapUserAdmin.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapUserAdmin.java index 456342e04..978b9a669 100644 --- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapUserAdmin.java +++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapUserAdmin.java @@ -120,7 +120,7 @@ public class LdapUserAdmin extends AbstractUserDirectory { throw new UserDirectoryException("Unsupported LDAP type for " + name); return res; } catch (NamingException e) { - log.error("Cannot get role: "+e.getMessage()); + log.error("Cannot get role: " + e.getMessage()); return null; } } @@ -144,9 +144,11 @@ public class LdapUserAdmin extends AbstractUserDirectory { Attribute objectClassAttr = attrs.get(objectClass.name()); LdapName dn = toDn(searchBase, searchResult); LdifUser role; - if (objectClassAttr.contains(getGroupObjectClass())) + if (objectClassAttr.contains(getGroupObjectClass()) + || objectClassAttr.contains(getGroupObjectClass().toLowerCase())) role = new LdifGroup(this, dn, attrs); - else if (objectClassAttr.contains(getUserObjectClass())) + else if (objectClassAttr.contains(getUserObjectClass()) + || objectClassAttr.contains(getUserObjectClass().toLowerCase())) role = new LdifUser(this, dn, attrs); else { log.warn("Unsupported LDAP type for " + searchResult.getName());