From d3481768e9dd4f21d23cc426d56c7eb023e91bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@fusiondirectory.org>
Date: Tue, 12 Jan 2021 15:00:23 +0000
Subject: [PATCH] Merge branch
'6142-the-filter-for-configuration-is-wrong-in-fusiondirectory-setup' into
'1.3-fixes'
Resolve "The filter for configuration is wrong in fusiondirectory-setup"
See merge request fusiondirectory/fd!855
(cherry picked from commit eaf1f258a3a27035b0ada2792843bcb0b34d8212)
398961a5 :ambulance: fix(fusiondirectory-setup) Fix configuration fetch when creating admin account
---
contrib/bin/fusiondirectory-setup | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index a511032fd..ee3f60184 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -601,8 +601,9 @@ sub add_ldap_admin {
# Get the configuration to know which attribute must be used in the dn
my $mesg = $ldap->search(
- base => "$base",
- filter => "(&(objectClass=fusionDirectoryConf)(cn=fusiondirectory))",
+ base => "$configrdn,$base",
+ filter => '(objectClass=fusionDirectoryConf)',
+ scope => 'base',
attrs => ['fdAccountPrimaryAttribute', 'fdForcePasswordDefaultHash', 'fdPasswordDefaultHash']
);
$mesg->code && die $mesg->error;
--
GitLab