X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdifAuthorization.java;h=d7f6ad960b7a50854d864068755dc48f99db71e6;hb=3c1cdc594d954520b14646102b366290bdad58c7;hp=354f8c0e224d333f2f55b3903178c1bc285614d6;hpb=9f729eeb8255a9d800ad2506735dda8cc215a135;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifAuthorization.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdifAuthorization.java index 354f8c0e2..d7f6ad960 100644 --- a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifAuthorization.java +++ b/org.argeo.util/src/org/argeo/osgi/useradmin/LdifAuthorization.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.Dictionary; import java.util.List; -import org.argeo.naming.LdapAttrs; +import org.argeo.util.naming.LdapAttrs; import org.osgi.service.useradmin.Authorization; import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.User; @@ -71,15 +71,15 @@ class LdifAuthorization implements Authorization { final static String extractDisplayName(User user) { Dictionary props = user.getProperties(); - Object displayName = props.get(LdapAttrs.displayName); + Object displayName = props.get(LdapAttrs.displayName.name()); if (displayName == null) - displayName = props.get(LdapAttrs.cn); + displayName = props.get(LdapAttrs.cn.name()); if (displayName == null) - displayName = props.get(LdapAttrs.uid); + displayName = props.get(LdapAttrs.uid.name()); if (displayName == null) displayName = user.getName(); if (displayName == null) - throw new UserDirectoryException("Cannot set display name for " + user); + throw new IllegalStateException("Cannot set display name for " + user); return displayName.toString(); } }