X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdifParser.java;fp=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdifParser.java;h=b59cc36e1bd1ee0714bb92d0ef0f387b124d8329;hb=d49ef557ceaa438399743027dcfd2c1b2e257126;hp=56bdb54e39adbc992ca14bda6df1ce59397cf6b6;hpb=429e967572de77a6144bd3d789b3a2f8002a590e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifParser.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifParser.java
index 56bdb54e3..b59cc36e1 100644
--- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifParser.java
+++ b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifParser.java
@@ -7,11 +7,13 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 
 import javax.naming.InvalidNameException;
+import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.BasicAttributes;
 import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.IOUtils;
@@ -70,6 +72,31 @@ class LdifParser {
 					// manage DN attributes
 					if (attributeId.equals("dn") || isLastLine) {
 						if (currentDn != null) {
+							//
+							// ADD
+							//
+							Rdn nameRdn = currentDn
+									.getRdn(currentDn.size() - 1);
+							Attribute nameAttr = currentAttributes.get(nameRdn
+									.getType());
+							if (nameAttr == null)
+								currentAttributes.put(nameRdn.getType(),
+										nameRdn.getValue());
+							else
+								try {
+									if (!nameAttr.get().equals(
+											nameRdn.getValue()))
+										throw new UserDirectoryException(
+												"Attribute "
+														+ nameAttr.getID()
+														+ "="
+														+ nameAttr.get()
+														+ " not consistent with DN "
+														+ currentDn);
+								} catch (NamingException e) {
+									throw new UserDirectoryException(
+											"Cannot get attribute value", e);
+								}
 							Attributes previous = res.put(currentDn,
 									currentAttributes);
 							if (log.isTraceEnabled())