From 340143248684eb5fd4d45f7924b9afa3442cd86c Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 8 Nov 2017 17:38:57 +0100
Subject: [PATCH] Fix regression

---
 .../src/org/argeo/naming/AuthPassword.java    | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/org.argeo.enterprise/src/org/argeo/naming/AuthPassword.java b/org.argeo.enterprise/src/org/argeo/naming/AuthPassword.java
index f9cfc69c8..4a5004eef 100644
--- a/org.argeo.enterprise/src/org/argeo/naming/AuthPassword.java
+++ b/org.argeo.enterprise/src/org/argeo/naming/AuthPassword.java
@@ -103,20 +103,22 @@ public class AuthPassword implements CallbackHandler {
 	public static AuthPassword matchAuthValue(Attributes attributes, char[] value) {
 		try {
 			Attribute authPassword = attributes.get(LdapAttrs.authPassword.name());
-			NamingEnumeration<?> values = authPassword.getAll();
-			while (values.hasMore()) {
-				Object val = values.next();
-				AuthPassword token = new AuthPassword(val.toString());
-				String auth;
-				if (Arrays.binarySearch(value, '$') >= 0) {
-					auth = token.authInfo + '$' + token.authValue;
-				} else {
-					auth = token.authValue;
+			if (authPassword != null) {
+				NamingEnumeration<?> values = authPassword.getAll();
+				while (values.hasMore()) {
+					Object val = values.next();
+					AuthPassword token = new AuthPassword(val.toString());
+					String auth;
+					if (Arrays.binarySearch(value, '$') >= 0) {
+						auth = token.authInfo + '$' + token.authValue;
+					} else {
+						auth = token.authValue;
+					}
+					if (Arrays.equals(auth.toCharArray(), value))
+						return token;
+					// if (token.matchAuthValue(value))
+					// return token;
 				}
-				if (Arrays.equals(auth.toCharArray(), value))
-					return token;
-				// if (token.matchAuthValue(value))
-				// return token;
 			}
 			return null;
 		} catch (NamingException e) {
-- 
2.30.2