Merge branch '2.3' into 2.4

This commit is contained in:
Marko
2019-07-05 10:39:03 +03:00
3 changed files with 7 additions and 5 deletions

View File

@ -137,7 +137,7 @@ void PamClientSession::get_pam_user_services(const DCB* dcb, const MYSQL_session
string services_query = string("SELECT authentication_string FROM ") + m_instance.m_tablename + " WHERE "
+ FIELD_USER + " = '" + session->user + "'"
+ " AND '" + dcb->remote + "' LIKE " + FIELD_HOST
+ " AND (" + FIELD_ANYDB + " = '1' OR '" + session->db + "' = '' OR '"
+ " AND (" + FIELD_ANYDB + " = '1' OR '" + session->db + "' IN ('information_schema', '') OR '"
+ session->db + "' LIKE " + FIELD_DB + ")"
+ " AND " + FIELD_PROXY + " = '0' ORDER BY authentication_string;";
MXS_DEBUG("PAM services search sql: '%s'.", services_query.c_str());