From 8ed6bdfdeb24679816f540f4a32e9e2e4bf08a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Mon, 9 Dec 2013 17:03:50 +0000
Subject: [PATCH] Fix use of check_password in DBI backend (#655)

---
 .../lib/Lemonldap/NG/Portal/PasswordDBDBI.pm             | 4 ++--
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_DBI.pm      | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/PasswordDBDBI.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/PasswordDBDBI.pm
index 8f1c3b1fd..26322adc8 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/PasswordDBDBI.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/PasswordDBDBI.pm
@@ -12,7 +12,7 @@ use base qw(Lemonldap::NG::Portal::_DBI );
 
 #inherits Lemonldap::NG::Portal::_SMTP
 
-our $VERSION = '1.2.2';
+our $VERSION = '1.3.2';
 
 ## @apmethod int passwordDBInit()
 # Load SMTP functions and call DBI authInit()
@@ -64,7 +64,7 @@ sub modifyPassword {
     # Check old password
     if ( $self->{oldpassword} ) {
 
-        my $result = $self->check_password( $user, $self->{oldpassword} );
+        my $result = $self->check_password( $dbh, $user, $self->{oldpassword} );
 
         unless ($result) {
             return PE_BADOLDPASSWORD;
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_DBI.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_DBI.pm
index 14dd2200d..afbfaeb91 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_DBI.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_DBI.pm
@@ -12,7 +12,7 @@ use strict;
 
 our @EXPORT = qw(dbh);
 
-our $VERSION = '1.2.3';
+our $VERSION = '1.3.2';
 
 ## @method protected Lemonldap::NG::Portal::_DBI dbh(string dbiChain, string dbiUser, string dbiPassword)
 # Create connection to database
@@ -65,16 +65,17 @@ sub hash_password {
 
 }
 
-## @method protected Lemonldap::NG::Portal::_DBI check_password(string user, string password)
+## @method protected Lemonldap::NG::Portal::_DBI check_password(ref dbh, string user, string password)
 # Verify user and password with SQL SELECT
+# @param dbh database handle
 # @param user user
 # @param password password
 # @return boolean result
 sub check_password {
     my $self        = shift;
     my $dbh         = shift;
-    my $user        = $self->{user};
-    my $password    = $self->{password};
+    my $user        = shift || $self->{user};
+    my $password    = shift || $self->{password};
     my $table       = $self->{dbiAuthTable};
     my $loginCol    = $self->{dbiAuthLoginCol};
     my $passwordCol = $self->{dbiAuthPasswordCol};