Merge branch '2.1' into develop

2017-03-14 10:45:25 +02:00
parent 7b3c287ac3 fbcd25342c
commit 8c7618035b
7 changed files with 86 additions and 66 deletions
--- a/server/modules/authenticator/MySQLAuth/dbusers.c
+++ b/server/modules/authenticator/MySQLAuth/dbusers.c
@ -238,12 +238,6 @@ int validate_mysql_user(sqlite3 *handle, DCB *dcb, MYSQL_session *session,
                rval = MXS_AUTH_FAILED_DB;
            }
        }
-        else if (session->auth_token_len)
-        {
-            /** If authentication fails, this will trigger the right
-             * error message with `Using password : YES` */
-            session->client_sha1[0] = '_';
-        }
    }

    return rval;