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

MXS-2196: Take Listener into use

Browse Source
This commit is contained in:
Markus Mäkelä
2018-11-30 11:43:33 +02:00
parent 330719c8f9
commit a10b6c2e89
16 changed files with 93 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/config_runtime.cc
View File

@ -978,16 +978,16 @@ bool runtime_create_listener(Service* service,
proto = "mariadbclient";
}
if (auth && strcasecmp(auth, CN_DEFAULT) == 0)
if (!auth || strcasecmp(auth, CN_DEFAULT) == 0)
{
/** Set auth to NULL so the protocol default authenticator is used */
auth = NULL;
/** Use protocol default authenticator*/
auth = "";
}
if (auth_opt && strcasecmp(auth_opt, CN_DEFAULT) == 0)
if (!auth_opt || strcasecmp(auth_opt, CN_DEFAULT) == 0)
{
/** Don't pass options to the authenticator */
auth_opt = NULL;
auth_opt = "";
}
unsigned short u_port = atoi(port);
@ -995,7 +995,7 @@ bool runtime_create_listener(Service* service,
std::lock_guard<std::mutex> guard(crt_lock);
if (!serviceHasListener(service, name, proto, addr, u_port))
if (!listener_find(name) && !service_find_listener(service, "", addr, u_port))
{
SSL_LISTENER* ssl = NULL;