Merge branch '2.2' into 2.3

2019-01-03 09:21:47 +02:00
parent 35d31801bb 8f0e4a3034
commit 26da72a41f
14 changed files with 235 additions and 148 deletions
--- a/server/modules/authenticator/PAM/PAMAuth/pam_client_session.cc
+++ b/server/modules/authenticator/PAM/PAMAuth/pam_client_session.cc
@ -332,9 +332,9 @@ Buffer PamClientSession::create_auth_change_packet() const

 int PamClientSession::authenticate(DCB* dcb)
 {
-    int rval = ssl_authenticate_check_status(dcb);
+    int rval = MXS_AUTH_SSL_COMPLETE;
    MYSQL_session* ses = static_cast<MYSQL_session*>(dcb->data);
-    if (rval == MXS_AUTH_SSL_COMPLETE && *ses->user)
+    if (*ses->user)
    {
        rval = MXS_AUTH_FAILED;
        if (m_state == PAM_AUTH_INIT)