Merge branch '2.2' into develop

2018-05-16 09:31:13 +03:00
parent 30cce333fd b5888d8950
commit 7e9062f20f
37 changed files with 380 additions and 419 deletions
--- a/server/modules/authenticator/MySQLAuth/mysql_auth.cc
+++ b/server/modules/authenticator/MySQLAuth/mysql_auth.cc
@ -651,6 +651,11 @@ int mysql_auth_reauthenticate(DCB *dcb, const char *user,
    MYSQL_AUTH *instance = (MYSQL_AUTH*)dcb->listener->auth_instance;
    int rc = validate_mysql_user(instance, dcb, &temp, scramble, scramble_len);

+    if (rc != MXS_AUTH_SUCCEEDED && service_refresh_users(dcb->service) == 0)
+    {
+        rc = validate_mysql_user(instance, dcb, &temp, scramble, scramble_len);
+    }
+
    if (rc == MXS_AUTH_SUCCEEDED)
    {
        memcpy(output_token, temp.client_sha1, output_token_len);