hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Johan Wikman
2018-03-26 10:07:17 +03:00
parent cf547b9532 2bdac88b0b
commit 33457c7334
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/dcb.cc
View File

@ -1265,7 +1265,7 @@ void dcb_final_close(DCB* dcb)
MXS_DEBUG("Closed socket %d on dcb %p.", dcb->fd, dcb);
}
if (dcb->path)
if (dcb->path && (dcb->dcb_role == DCB_ROLE_SERVICE_LISTENER))
{
if (unlink(dcb->path) != 0)
{
@ -2426,7 +2426,9 @@ dcb_accept(DCB *dcb)
if (client_conn.ss_family == AF_UNIX)
{
// client address
client_dcb->ip.ss_family = AF_UNIX;
client_dcb->remote = MXS_STRDUP_A("localhost");
client_dcb->path = MXS_STRDUP_A(dcb->path);
}
else
{

12
server/modules/authenticator/MySQLAuth/mysql_auth.c
View File

@ -304,8 +304,16 @@ mysql_auth_authenticate(DCB *dcb)
}
else if (dcb->service->log_auth_warnings)
{
MXS_WARNING("%s: login attempt for user '%s'@[%s]:%d, authentication failed.",
dcb->service->name, client_data->user, dcb->remote, dcb_get_port(dcb));
if (dcb->path)
{
MXS_WARNING("%s: login attempt for user '%s'@[%s]:%s, authentication failed.",
dcb->service->name, client_data->user, dcb->remote, dcb->path);
}
else
{
MXS_WARNING("%s: login attempt for user '%s'@[%s]:%d, authentication failed.",
dcb->service->name, client_data->user, dcb->remote, dcb_get_port(dcb));
}
if (is_localhost_address(&dcb->ip) &&
!dcb->service->localhost_match_wildcard_host)