Merge branch '2.3' into develop

2019-01-07 10:52:07 +02:00
parent cf9ac9004e 0859f3caff
commit f0f9c21d1c
67 changed files with 777 additions and 469 deletions
--- a/server/modules/authenticator/MySQLAuth/mysql_auth.cc
+++ b/server/modules/authenticator/MySQLAuth/mysql_auth.cc
@ -285,9 +285,9 @@ static bool is_localhost_address(struct sockaddr_storage* addr)
 */
 static int mysql_auth_authenticate(DCB* dcb)
 {
-    int auth_ret = ssl_authenticate_check_status(dcb);
+    int auth_ret = MXS_AUTH_SSL_COMPLETE;
    MYSQL_session* client_data = (MYSQL_session*)dcb->data;
-    if (auth_ret == MXS_AUTH_SSL_COMPLETE && *client_data->user)
+    if (*client_data->user)
    {
        MXS_DEBUG("Receiving connection from '%s' to database '%s'.",
                  client_data->user,