From a29c83a534694d1bd7c0cba8488b700c801b8660 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Mon, 4 May 2015 21:59:15 -0400 Subject: [PATCH] [SIGNED-OFF]Bug 14144: Silence warnings in t/db_dependent/Auth_with_ldap.t TEST PLAN ---------- 1) prove t/db_dependent/Auth_with_ldap.t -- there is a shibboleth related warning 2) apply patch 3) prove t/db_dependent/Auth_with_ldap.t -- now there is not. 4) koha qa test tools. NOTE: Further investigation determined this would merely delay it, as the function is not called by this test. A delay is better than nothing. Signed-off-by: Hector Castro --- C4/Auth_with_ldap.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm index c50df76..5aa514d 100644 --- a/C4/Auth_with_ldap.pm +++ b/C4/Auth_with_ldap.pm @@ -27,7 +27,6 @@ use C4::Members qw(AddMember changepassword); use C4::Members::Attributes; use C4::Members::AttributeTypes; use C4::Members::Messaging; -use C4::Auth qw(checkpw_internal); use Koha::AuthUtils qw(hash_password); use List::MoreUtils qw( any ); use Net::LDAP; @@ -336,7 +335,8 @@ sub _do_changepassword { $debug and print STDERR "changing local password for borrowernumber=$borrowerid to '$digest'\n"; changepassword($userid, $borrowerid, $digest); - my ($ok, $cardnum) = checkpw_internal(C4::Context->dbh, $userid, $password); + require C4::Auth; + my ($ok, $cardnum) = C4::Auth::checkpw_internal(C4::Context->dbh, $userid, $password); return $cardnum if $ok; warn "Password mismatch after update to borrowernumber=$borrowerid"; -- 1.7.10.4