Force use of mysql_native_password for test account

To allow older client library to authenticate against newer server.

MySQL and MariaDB have different one line syntaxes for this - the version
implemented here works with both.

diff --git a/.github/actions/ci-tests/action.yml b/.github/actions/ci-tests/action.yml
index 57d13502117de07dc139f8e460642da76c601653..6c94a4bf448a6333b9ca6dfb7ebeb45c942a4d4d 100644 (file)
--- a/.github/actions/ci-tests/action.yml
+++ b/.github/actions/ci-tests/action.yml
@@ -155,7 +155,7 @@ runs:
       if: ${{ inputs.use_docker == 'true' }}
       shell: bash
       run: |
-        mysql -h ${{ inputs.sql_mysql_test_server }} -u root -e "CREATE USER 'radius'@'%' IDENTIFIED BY 'radpass';"
+        mysql -h ${{ inputs.sql_mysql_test_server }} -u root -e "CREATE USER 'radius'@'%' IDENTIFIED WITH mysql_native_password; ALTER USER 'radius'@'%' IDENTIFIED BY 'radpass';"
         mysql -h ${{ inputs.sql_mysql_test_server }} -u root -e "GRANT ALL ON radius.* TO 'radius'; FLUSH PRIVILEGES;"
 
     - name: Setup databases

diff --git a/raddb/mods-config/sql/main/mysql/setup.sql b/raddb/mods-config/sql/main/mysql/setup.sql
index a4a142f4fefe31655dc5887f1ad353e6b7dc119d..f77dc56325585999e0ccb0b447da394781409ba0 100755 (executable)
--- a/raddb/mods-config/sql/main/mysql/setup.sql
+++ b/raddb/mods-config/sql/main/mysql/setup.sql
@@ -12,7 +12,8 @@
 --
 --  Create default administrator for RADIUS
 --
-CREATE USER 'radius'@'localhost' IDENTIFIED BY 'radpass';
+CREATE USER 'radius'@'localhost' IDENTIFIED WITH mysql_native_password;
+ALTER USER 'radius'@'localhost' IDENTIFIED BY 'radpass';
 
 --
 --  The server can read the authorisation data