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:
Esa Korhonen
2018-03-13 11:26:41 +02:00
parent 69383c0943 633b08ed0d
commit dad6a4f9bf
9 changed files with 59 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/service.cc
View File

@ -2485,7 +2485,11 @@ void service_print_users(DCB *dcb, const SERVICE *service)
if (listener_is_active(listener) && listener->listener &&
listener->listener->authfunc.diagnostic)
{
dcb_printf(dcb, "User names (%s): ", listener->name);
listener->listener->authfunc.diagnostic(dcb, listener);
dcb_printf(dcb, "\n");
}
}
}

13
server/core/users.cc
View File

@ -166,7 +166,6 @@ public:
dcb_printf(dcb, "%s%s", sep, it->first.c_str());
sep = ", ";
}
dcb_printf(dcb, "\n");
}
}
@ -324,17 +323,7 @@ void users_default_diagnostic(DCB* dcb, SERV_LISTENER* port)
{
if (port->users)
{
Users* u = reinterpret_cast<Users*>(port->users);
if (u->empty())
{
dcb_printf(dcb, "Users table is empty\n");
}
else
{
dcb_printf(dcb, "User names: ");
users_diagnostic(dcb, port->users);
}
users_diagnostic(dcb, port->users);
}
}