Fix creating users and changing password in MySQL 8 (bug #663)
This commit is contained in:
parent
d114535911
commit
a2ec51e948
|
@ -1,2 +1,2 @@
|
||||||
<?php
|
<?php
|
||||||
$VERSION = "4.7.1";
|
$VERSION = "4.7.2-dev";
|
||||||
|
|
|
@ -52,7 +52,7 @@ if ($_POST && !$error) {
|
||||||
} else {
|
} else {
|
||||||
$new_user = q($_POST["user"]) . "@" . q($_POST["host"]); // if $_GET["host"] is not set then $new_user is always different
|
$new_user = q($_POST["user"]) . "@" . q($_POST["host"]); // if $_GET["host"] is not set then $new_user is always different
|
||||||
$pass = $_POST["pass"];
|
$pass = $_POST["pass"];
|
||||||
if ($pass != '' && !$_POST["hashed"]) {
|
if ($pass != '' && !$_POST["hashed"] && !min_version(8)) {
|
||||||
// compute hash in a separate query so that plain text password is not saved to history
|
// compute hash in a separate query so that plain text password is not saved to history
|
||||||
$pass = $connection->result("SELECT PASSWORD(" . q($pass) . ")");
|
$pass = $connection->result("SELECT PASSWORD(" . q($pass) . ")");
|
||||||
$error = !$pass;
|
$error = !$pass;
|
||||||
|
@ -61,7 +61,7 @@ if ($_POST && !$error) {
|
||||||
$created = false;
|
$created = false;
|
||||||
if (!$error) {
|
if (!$error) {
|
||||||
if ($old_user != $new_user) {
|
if ($old_user != $new_user) {
|
||||||
$created = queries((min_version(5) ? "CREATE USER" : "GRANT USAGE ON *.* TO") . " $new_user IDENTIFIED BY PASSWORD " . q($pass));
|
$created = queries((min_version(5) ? "CREATE USER" : "GRANT USAGE ON *.* TO") . " $new_user IDENTIFIED BY " . (min_version(8) ? "" : "PASSWORD ") . q($pass));
|
||||||
$error = !$created;
|
$error = !$created;
|
||||||
} elseif ($pass != $old_pass) {
|
} elseif ($pass != $old_pass) {
|
||||||
queries("SET PASSWORD FOR $new_user = " . q($pass));
|
queries("SET PASSWORD FOR $new_user = " . q($pass));
|
||||||
|
@ -136,7 +136,7 @@ if ($_POST) {
|
||||||
<tr><th><?php echo lang('Username'); ?><td><input name="user" data-maxlength="80" value="<?php echo h($row["user"]); ?>" autocapitalize="off">
|
<tr><th><?php echo lang('Username'); ?><td><input name="user" data-maxlength="80" value="<?php echo h($row["user"]); ?>" autocapitalize="off">
|
||||||
<tr><th><?php echo lang('Password'); ?><td><input name="pass" id="pass" value="<?php echo h($row["pass"]); ?>" autocomplete="new-password">
|
<tr><th><?php echo lang('Password'); ?><td><input name="pass" id="pass" value="<?php echo h($row["pass"]); ?>" autocomplete="new-password">
|
||||||
<?php if (!$row["hashed"]) { echo script("typePassword(qs('#pass'));"); } ?>
|
<?php if (!$row["hashed"]) { echo script("typePassword(qs('#pass'));"); } ?>
|
||||||
<?php echo checkbox("hashed", 1, $row["hashed"], lang('Hashed'), "typePassword(this.form['pass'], this.checked);"); ?>
|
<?php echo (min_version(8) ? "" : checkbox("hashed", 1, $row["hashed"], lang('Hashed'), "typePassword(this.form['pass'], this.checked);")); ?>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
Adminer 4.7.2-dev:
|
||||||
|
MySQL: Fix creating users and changing password in MySQL 8 (bug #663)
|
||||||
|
|
||||||
Adminer 4.7.1 (released 2019-01-24):
|
Adminer 4.7.1 (released 2019-01-24):
|
||||||
Display the tables scrollbar (bug #647)
|
Display the tables scrollbar (bug #647)
|
||||||
Remember visible columns in Create Table form (bug #493)
|
Remember visible columns in Create Table form (bug #493)
|
||||||
|
|
Loading…
Reference in a new issue