X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FUserAdminUtils.java;h=3c24f98af3574627fc3f1bbe6fdf7762c7e165ba;hb=0e533d2562def311fdd7aa71f1d0d704e466861e;hp=5a365721136bc07a742d4a3128a996854650f323;hpb=0ce8ecfe974cec9f524c16884209cd08544d890d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
index 5a3657211..3c24f98af 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
@@ -6,8 +6,9 @@ import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
+import org.argeo.api.acr.ldap.LdapAttrs;
 import org.argeo.api.cms.CmsConstants;
-import org.argeo.util.naming.LdapAttrs;
+import org.argeo.cms.CurrentUser;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
@@ -76,6 +77,8 @@ public class UserAdminUtils {
 		String dName = getProperty(user, LdapAttrs.displayName.name());
 		if (isEmpty(dName))
 			dName = getProperty(user, LdapAttrs.cn.name());
+		if (isEmpty(dName))
+			dName = getProperty(user, LdapAttrs.uid.name());
 		if (isEmpty(dName))
 			dName = getUserLocalId(user.getName());
 		return dName;
@@ -136,7 +139,7 @@ public class UserAdminUtils {
 	/** Simply retrieves a display name of the relevant domain */
 	public final static String getDomainName(User user) {
 		String dn = user.getName();
-		if (dn.endsWith(CmsConstants.ROLES_BASEDN))
+		if (dn.endsWith(CmsConstants.SYSTEM_ROLES_BASEDN))
 			return "System roles";
 		if (dn.endsWith(CmsConstants.TOKENS_BASEDN))
 			return "Tokens";