gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11423 from devenbansod/sha256_not_in_mariadb

Browse Source 
MariaDB 10.0.21 does not support sha256_password auth plugin
This commit is contained in:
Marc Delisle 2015-08-23 07:20:33 -04:00
commit 68313a0e0a
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/display_change_password.lib.php
View File

@ -82,7 +82,9 @@ function PMA_getHtmlForChangePassword($username, $hostname)
);
// See http://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-5.html
if (PMA_MYSQL_INT_VERSION >= 50705) {
if (PMA_Util::getServerType() == 'MySQL'
&& PMA_MYSQL_INT_VERSION >= 50705
) {
$html .= '<tr class="vmiddle">'
. '<td>' . __('Password Hashing:') . '</td>'
. '<td>'
@ -111,7 +113,9 @@ function PMA_getHtmlForChangePassword($username, $hostname)
. '</label>'
. '</td>'
. '</tr>';
} elseif (PMA_MYSQL_INT_VERSION >= 50606) {
} elseif (PMA_Util::getServerType() == 'MySQL'
&& PMA_MYSQL_INT_VERSION >= 50606
) {
$html .= '<tr class="vmiddle" id="tr_element_before_generate_password">'
. '<td>' . __('Password Hashing:') . '</td>'
. '<td>'

8
libraries/server_privileges.lib.php
View File

@ -1700,7 +1700,9 @@ function PMA_getHtmlForLoginInformationFields(
. '>' . __('MySQL native password') . '</option>';
// sha256 auth plugin exists only for 5.6.6+
if (PMA_MYSQL_INT_VERSION >= 50606) {
if (PMA_Util::getServerType() == 'MySQL'
&& PMA_MYSQL_INT_VERSION >= 50606
) {
$html_output .= '<option value="sha256_password" '
. ($orig_auth_plugin == 'sha256_password' ? ' selected ' : '')
. ' >' . __('SHA256 password') . '</option>';
@ -5016,7 +5018,9 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
$sql_query = '';
}
if (PMA_MYSQL_INT_VERSION >= 50700) {
if (PMA_Util::getServerType() == 'MySQL'
&& PMA_MYSQL_INT_VERSION >= 50700
) {
$password_set_real = null;
$password_set_show = null;
} else {

1
test/libraries/PMA_server_privileges_test.php
View File

@ -689,6 +689,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
);
$this->assertEquals(
"CREATE USER ''@'localhost';GRANT USAGE ON *.* TO ''@'localhost' REQUIRE NONE;"
. "SET PASSWORD FOR ''@'localhost' = PASSWORD('***');"
. "GRANT ALL PRIVILEGES ON `pma_dbname`.* TO ''@'localhost';",
$sql_query
);