bug #1478812, Add new user, password containing backslash

This commit is contained in:
Marc Delisle
2006-05-17 10:33:23 +00:00
parent 1159c2ca78
commit fde2f613ad
2 changed files with 7 additions and 6 deletions

View File

@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-05-17 Marc Delisle <lem9@users.sourceforge.net>
* server_privileges.php: bug #1478812, Add user (password containing
a backslash); also minor optimization
2006-05-15 Marc Delisle <lem9@users.sourceforge.net> 2006-05-15 Marc Delisle <lem9@users.sourceforge.net>
* libraries/Table.class.php: bug #1475949, removing the default value * libraries/Table.class.php: bug #1475949, removing the default value

View File

@@ -764,15 +764,12 @@ if (!empty($adduser_submit) || !empty($change_copy)) {
'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON *.* TO \'' 'GRANT ' . join(', ', PMA_extractPrivInfo()) . ' ON *.* TO \''
. PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\''; . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\'';
if ($pred_password != 'none' && $pred_password != 'keep') { if ($pred_password != 'none' && $pred_password != 'keep') {
$pma_pw_hidden = ''; $pma_pw_hidden = str_repeat('*', strlen($pma_pw));
for ($i = 0; $i < strlen($pma_pw); $i++) {
$pma_pw_hidden .= '*';
}
$sql_query = $real_sql_query . ' IDENTIFIED BY \'' . $pma_pw_hidden . '\''; $sql_query = $real_sql_query . ' IDENTIFIED BY \'' . $pma_pw_hidden . '\'';
$real_sql_query .= ' IDENTIFIED BY \'' . $pma_pw . '\''; $real_sql_query .= ' IDENTIFIED BY \'' . PMA_sqlAddslashes($pma_pw) . '\'';
if ( isset( $create_user_real ) ) { if ( isset( $create_user_real ) ) {
$create_user_show = $create_user_real . ' IDENTIFIED BY \'' . $pma_pw_hidden . '\''; $create_user_show = $create_user_real . ' IDENTIFIED BY \'' . $pma_pw_hidden . '\'';
$create_user_real .= ' IDENTIFIED BY \'' . $pma_pw . '\''; $create_user_real .= ' IDENTIFIED BY \'' . PMA_sqlAddslashes($pma_pw) . '\'';
} }
} else { } else {
if ($pred_password == 'keep' && !empty($password)) { if ($pred_password == 'keep' && !empty($password)) {