X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdapUserAdmin.java;h=a9e32fae5697708412eee9d953215c202803d843;hb=5d39143d7ea77173300af60264d191101e310902;hp=cf97ebea393e5cbe06a9de38180ec14615d858da;hpb=780f1fce719bb66b4e4899c2339cb49d62c07dc6;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 cf97ebea3..a9e32fae5 100644
--- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
+++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
@@ -82,16 +82,19 @@ public class LdapUserAdmin extends AbstractUserDirectory {
 	@Override
 	protected AbstractUserDirectory scope(User user) {
 		Dictionary<String, Object> credentials = user.getCredentials();
-		// FIXME use arrays
 		String username = (String) credentials.get(SHARED_STATE_USERNAME);
 		if (username == null)
 			username = user.getName();
-		// byte[] pwd = (byte[]) credentials.get(SHARED_STATE_PASSWORD);
-		// char[] password = DigestUtils.bytesToChars(pwd);
 		Dictionary<String, Object> properties = cloneProperties();
 		properties.put(Context.SECURITY_PRINCIPAL, username.toString());
-		// properties.put(Context.SECURITY_CREDENTIALS, password);
-		properties.put(Context.SECURITY_AUTHENTICATION, "GSSAPI");
+		Object pwdCred = credentials.get(SHARED_STATE_PASSWORD);
+		byte[] pwd = (byte[]) pwdCred;
+		if (pwd != null) {
+			char[] password = DigestUtils.bytesToChars(pwd);
+			properties.put(Context.SECURITY_CREDENTIALS, new String(password));
+		} else {
+			properties.put(Context.SECURITY_AUTHENTICATION, "GSSAPI");
+		}
 		return new LdapUserAdmin(properties);
 	}