From 8edfb54014637a3d13ba2cb9f32322dcdc3b898c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 7 Dec 2016 10:14:38 +0100
Subject: [PATCH] Fixes #5280 Renamed tokenRDN in recoveryTokenRDN
---
html/class_passwordRecovery.inc | 4 ++--
include/functions.inc | 4 ++--
plugins/config/class_recoveryConfig.inc | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index 49c79efe5..eb71ad2e2 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -374,7 +374,7 @@ class passwordRecovery extends standAlonePage {
$ldap = $config->get_ldap_link();
// Check if token branch is here
- $token = get_ou('tokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
+ $token = get_ou('recoveryTokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
$ldap->cat($token, array('dn'));
if (!$ldap->count()) {
/* It's not, let's create it */
@@ -421,7 +421,7 @@ class passwordRecovery extends standAlonePage {
/* Retrieve hash from the ldap */
$ldap = $config->get_ldap_link();
- $token = get_ou('tokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
+ $token = get_ou('recoveryTokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
$dn = "ou=".$this->uid.",$token";
$ldap->cat($dn);
$attrs = $ldap->fetch();
diff --git a/include/functions.inc b/include/functions.inc
index 71226dc63..c47545665 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1286,8 +1286,8 @@ function get_ou($name)
$map = array(
'fusiondirectoryRDN' => 'ou=fusiondirectory,',
'lockRDN' => 'ou=locks,',
- 'tokenRDN' => 'ou=tokens,',
- 'fdReminderTokenRDN' => 'ou=reminder,',
+ 'recoveryTokenRDN' => 'ou=recovery,',
+ 'reminderTokenRDN' => 'ou=reminder,',
'roleRDN' => 'ou=roles,',
'ogroupRDN' => 'ou=groups,',
'applicationRDN' => 'ou=apps,',
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc
index 521ce8104..7ab146a12 100644
--- a/plugins/config/class_recoveryConfig.inc
+++ b/plugins/config/class_recoveryConfig.inc
@@ -122,7 +122,7 @@ class recoveryConfig extends simplePlugin
global $config;
// Check if token branch is here
$ldap = $config->get_ldap_link();
- $tokenBranch = get_ou('tokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
+ $tokenBranch = get_ou('recoveryTokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
$ldap->cat($tokenBranch, array('dn'));
if (!$ldap->count()) {
$ldap->cd($config->current['BASE']);
--
GitLab