Fixes #5280 Renamed tokenRDN in recoveryTokenRDN

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();

include/functions.inc

@@ -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,',

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']);