Skip to content

Commit b8459a6

Browse files
committed
Rework empty password mariadb users check.
1 parent c34d256 commit b8459a6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

install/hst-install-debian.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,8 @@ if [ "$mysql" = 'yes' ]; then
10901090
mysql -e "DELETE FROM mysql.user WHERE User=''"
10911091
mysql -e "DROP DATABASE test" > /dev/null 2>&1
10921092
mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'"
1093-
mysql -e "DELETE FROM mysql.user WHERE user='' OR authentication_string='';"
1093+
mysql -e "DELETE FROM mysql.user WHERE user='';"
1094+
mysql -e "DELETE FROM mysql.user WHERE password='' AND authentication_string='';"
10941095

10951096
# Configuring phpMyAdmin
10961097
if [ "$apache" = 'yes' ]; then

install/hst-install-ubuntu.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,8 @@ if [ "$mysql" = 'yes' ]; then
10701070
mysql -e "DELETE FROM mysql.user WHERE User=''"
10711071
mysql -e "DROP DATABASE test" > /dev/null 2>&1
10721072
mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'"
1073-
mysql -e "DELETE FROM mysql.user WHERE user='' OR authentication_string='';"
1073+
mysql -e "DELETE FROM mysql.user WHERE user='';"
1074+
mysql -e "DELETE FROM mysql.user WHERE password='' AND authentication_string='';"
10741075

10751076
# Configuring phpMyAdmin
10761077
if [ "$apache" = 'yes' ]; then

0 commit comments

Comments
 (0)