From 8d8fc8dd372e0883e386cb7cecf1483a6f73d1cb Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 25 Feb 2011 17:53:12 +0100
Subject: [PATCH] =?utf8?q?Legacy-Interface:=20Auth::authenticate=20unterst?=
 =?utf8?q?=C3=BCtzt=20"is=5Fcrypted"=20nicht=20mehr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/Dispatcher.pm     | 2 +-
 bin/mozilla/admin.pl | 2 +-
 bin/mozilla/login.pl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 406510e2c..55d238022 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -198,7 +198,7 @@ sub handle_request {
 
       $::locale = Locale->new($::myconfig{countrycode});
 
-      show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password}, 0);
+      show_error('login/password_error', 'password') if SL::Auth::OK != $::auth->authenticate($::form->{login}, $::form->{password});
 
       $::auth->set_session_value('login', $::form->{login}, 'password', $::form->{password});
       $::auth->create_or_refresh_session;
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index b89487c7e..e92de0c24 100755
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -78,7 +78,7 @@ sub run {
   $form->{favicon}    = "favicon.ico";
 
   if ($form->{action}) {
-    if ($auth->authenticate_root($form->{rpw}, 0) != $auth->OK()) {
+    if ($auth->authenticate_root($form->{rpw}) != $auth->OK()) {
       $form->{error_message} = $locale->text('Incorrect Password!');
       adminlogin();
     } else {
diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index 43ef95224..4d3679c78 100644
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -65,7 +65,7 @@ sub run {
     %::myconfig = $auth->read_user($form->{login}) if ($form->{login});
     $::locale   = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
 
-    if (!$::myconfig{login} || (SL::Auth::OK != $auth->authenticate($form->{login}, $form->{password}, 0))) {
+    if (!$::myconfig{login} || (SL::Auth::OK != $auth->authenticate($form->{login}, $form->{password}))) {
       $form->{error_message} = $::locale->text('Incorrect username or password!');
       login_screen();
     } else {
-- 
2.20.1