From 040fc6dd0feea73d71ca73cc69ecfb55b996b769 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 11 Nov 2014 19:02:01 +0100
Subject: [PATCH 1/3] [ticket/13332] Pass user row to passwords manager check
 method

PHPBB3-13332
---
 phpBB/phpbb/auth/provider/db.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
index 722eeffa9a..1281cb0715 100644
--- a/phpBB/phpbb/auth/provider/db.php
+++ b/phpBB/phpbb/auth/provider/db.php
@@ -87,7 +87,7 @@ class db extends \phpbb\auth\provider\base
 
 		$username_clean = utf8_clean_string($username);
 
-		$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type, user_login_attempts
+		$sql = 'SELECT *
 			FROM ' . USERS_TABLE . "
 			WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'";
 		$result = $this->db->sql_query($sql);
@@ -175,7 +175,7 @@ class db extends \phpbb\auth\provider\base
 		}
 
 		// Check password ...
-		if ($this->passwords_manager->check($password, $row['user_password']))
+		if ($this->passwords_manager->check($password, $row['user_password'], $row))
 		{
 			// Check for old password hash...
 			if ($this->passwords_manager->convert_flag || strlen($row['user_password']) == 32)

From 91f7d53d8e1a03b72e436958bbe8decbb4972428 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 11 Nov 2014 19:02:20 +0100
Subject: [PATCH 2/3] [ticket/13332] Remove useless $result assignment

PHPBB3-13332
---
 phpBB/phpbb/auth/provider/db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
index 1281cb0715..ba67c11e75 100644
--- a/phpBB/phpbb/auth/provider/db.php
+++ b/phpBB/phpbb/auth/provider/db.php
@@ -123,7 +123,7 @@ class db extends \phpbb\auth\provider\base
 				'username_clean'		=> $username_clean,
 			);
 			$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $this->db->sql_build_array('INSERT', $attempt_data);
-			$result = $this->db->sql_query($sql);
+			$this->db->sql_query($sql);
 		}
 		else
 		{

From 63022f3c59f01ac1456cde4e837c1431a6664691 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 12 Nov 2014 11:42:08 +0100
Subject: [PATCH 3/3] [ticket/13332] Fix auth provider tests

PHPBB3-13332
---
 tests/auth/provider_db_test.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/auth/provider_db_test.php b/tests/auth/provider_db_test.php
index e33eae6b54..09ca0816bf 100644
--- a/tests/auth/provider_db_test.php
+++ b/tests/auth/provider_db_test.php
@@ -78,7 +78,14 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case
 				),
 		);
 
-		$this->assertEquals($expected, $provider->login('foobar', 'example'));
+		$login_return = $provider->login('foobar', 'example');
+		$this->assertEquals($expected['status'], $login_return['status']);
+		$this->assertEquals($expected['error_msg'], $login_return['error_msg']);
+
+		foreach ($expected['user_row'] as $key => $value)
+		{
+			$this->assertEquals($value, $login_return['user_row'][$key]);
+		}
 
 		// Check if convert works
 		$login_return = $provider->login('foobar2', 'example');