From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 22 Jun 2022 04:51:39 +0000 (+0200)
Subject: Fix functional filter
X-Git-Tag: v2.3.10~175
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=00ca9fa781f633e369fd3a66b75368857c396339;p=lgpl%2Fargeo-commons.git

Fix functional filter
---

diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/LdapUserAdmin.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
index 52fa38b11..82e890b7c 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
+++ b/org.argeo.util/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
@@ -208,8 +208,12 @@ public class LdapUserAdmin extends AbstractUserDirectory {
 				LdapName dn = toDn(searchBase, searchResult);
 				Attributes attrs = searchResult.getAttributes();
 				LdifHierarchyUnit hierarchyUnit = new LdifHierarchyUnit(this, dn, attrs);
-				if (hierarchyUnit.isFunctional())
+				if (functionalOnly) {
+					if (hierarchyUnit.isFunctional())
+						res.add(hierarchyUnit);
+				} else {
 					res.add(hierarchyUnit);
+				}
 			}
 			return res;
 		} catch (NamingException e) {