Commit aa0f3dc5 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #5280 Renamed tokenRDN in recoveryTokenRDN

parent 8cd0fb23
......@@ -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();
......
......@@ -1010,8 +1010,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,',
......
......@@ -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']);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment