From e0b1cd8781ed57b1d1370ab17def39238456ddd1 Mon Sep 17 00:00:00 2001
From: Valentin Tolmer <valentin.tolmer@gmail.com>
Date: Sun, 7 Nov 2021 14:56:48 +0100
Subject: [PATCH] ldap: Improve support for group filters

---
 server/src/infra/ldap_handler.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/infra/ldap_handler.rs b/server/src/infra/ldap_handler.rs
index 5d7093d..daa3132 100644
--- a/server/src/infra/ldap_handler.rs
+++ b/server/src/infra/ldap_handler.rs
@@ -585,7 +585,9 @@ impl<Backend: BackendHandler + LoginHandler + OpaqueHandler> LdapHandler<Backend
                     bail!("Unsupported group filter: {:?}", filter)
                 }
             }
-            LdapFilter::And(v) if v.is_empty() => Ok(None),
+            LdapFilter::And(v) => v
+                .iter()
+                .fold(Ok(None), |o, f| Ok(o?.xor(self.get_group_filter(f)?))),
             _ => bail!("Unsupported group filter: {:?}", filter),
         }
     }