From 6cd8b8c5f4d264939cbf3cfb57dd7dedd9fc7fac Mon Sep 17 00:00:00 2001
From: Sandro Cazzaniga <cazzaniga.sandro@gmail.com>
Date: Tue, 21 Aug 2012 07:24:27 +0000
Subject: [PATCH]     * [LEMONLDAP-506] Disable LDAP Cache in multi mode

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm
index 416aec010..eaeff13af 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_LDAP.pm
@@ -259,9 +259,9 @@ sub userModifyPassword {
             return PE_BADOLDPASSWORD if ( $mesg->code == 53 );
         }
         else {
-            if ( $self->{portal}->{portalRequireOldPassword} 
-	        and !$self->{portal}->{mail_token} ) 
-	    {
+            if ( $self->{portal}->{portalRequireOldPassword}
+                and !$self->{portal}->{mail_token} )
+            {
 
                 return PE_MUST_SUPPLY_OLD_PASSWORD if ( !$oldpassword );
 
@@ -382,7 +382,10 @@ sub userModifyPassword {
 # @return Lemonldap::NG::Portal::_LDAP object
 sub ldap {
     my $self = shift;
-    return $self->{ldap} if ( ref( $self->{ldap} ) );
+    unless ( $self->{_multi} ) {
+        return $self->{ldap} if ( ref( $self->{ldap} ) );
+    }
+    $self->lmLog("LDAP Cache disabled in multi mode", 'debug');
     if ( $self->{ldap} = Lemonldap::NG::Portal::_LDAP->new($self)
         and my $mesg = $self->{ldap}->bind )
     {