From 6f20d426ad059eefb3893c1ee5b5edb9ce204558 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Thu, 26 Jun 2025 21:55:10 +1000
Subject: [PATCH] Dont sort by DN, problematic when sssvlv overlay is used in
 openldap. Seems DN's are sorted anyway. Fixes #350

---
 app/Classes/LDAP/Server.php                       | 1 -
 tests/server/openldap/schema/modify/00-ssslv.ldif | 4 ++++
 tests/server/openldap/schema/modify/40-ssslv.ldif | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 tests/server/openldap/schema/modify/00-ssslv.ldif
 create mode 100644 tests/server/openldap/schema/modify/40-ssslv.ldif

diff --git a/app/Classes/LDAP/Server.php b/app/Classes/LDAP/Server.php
index d24386e0..74341ce1 100644
--- a/app/Classes/LDAP/Server.php
+++ b/app/Classes/LDAP/Server.php
@@ -275,7 +275,6 @@ final class Server
 					'c'					// Needed for the tree to show icons for countries
 				]))
 			->list()
-			->orderBy('dn')
 			->get() ?: NULL;
 	}
 
diff --git a/tests/server/openldap/schema/modify/00-ssslv.ldif b/tests/server/openldap/schema/modify/00-ssslv.ldif
new file mode 100644
index 00000000..05887ff8
--- /dev/null
+++ b/tests/server/openldap/schema/modify/00-ssslv.ldif
@@ -0,0 +1,4 @@
+dn: cn=z-module{0},cn=config
+changetype: modify
+add: olcModuleLoad
+olcModuleLoad: sssvlv
diff --git a/tests/server/openldap/schema/modify/40-ssslv.ldif b/tests/server/openldap/schema/modify/40-ssslv.ldif
new file mode 100644
index 00000000..c8bfb844
--- /dev/null
+++ b/tests/server/openldap/schema/modify/40-ssslv.ldif
@@ -0,0 +1,8 @@
+dn: olcOverlay=sssvlv,olcDatabase={4}mdb,cn=config
+changetype: add
+objectClass: olcOverlayConfig
+objectClass: olcSssVlvConfig
+olcOverlay: sssvlv
+olcSssVlvMax: 1
+olcSssVlvMaxKeys: 5
+olcSssVlvMaxPerConn: 5