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

MXS-1929: Output const strings from serviceGetUser

Browse Source 
The values aren't meant to be modified by the caller.
This commit is contained in:
Markus Mäkelä
2018-08-02 23:01:44 +03:00
parent 7d6338d65b
commit b20decfe1c
10 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/routing/binlogrouter/blr.cc
View File

@ -240,9 +240,11 @@ static MXS_ROUTER* createInstance(SERVICE *service, MXS_CONFIG_PARAMETER* params
uuid_t defuuid;
int rc = 0;
char task_name[BLRM_TASK_NAME_LEN + 1] = "";
const char* user;
const char* password;
serviceGetUser(service, &user, &password);
if (!service->credentials.name[0] ||
!service->credentials.authdata[0])
if (!user[0] || !password[0])
{
MXS_ERROR("%s: Error: Service is missing user credentials."
" Add the missing username or passwd parameter to the service.",
@ -287,8 +289,8 @@ static MXS_ROUTER* createInstance(SERVICE *service, MXS_CONFIG_PARAMETER* params
inst->master = NULL;
inst->client = NULL;
inst->user = MXS_STRDUP_A(service->credentials.name);
inst->password = MXS_STRDUP_A(service->credentials.authdata);
inst->user = MXS_STRDUP_A(user);
inst->password = MXS_STRDUP_A(password);
inst->retry_count = 0;
inst->m_errno = 0;
inst->m_errmsg = NULL;

8
server/modules/routing/binlogrouter/test/testbinlog.cc
View File

@ -167,10 +167,12 @@ int main(int argc, char **argv)
return 1;
}
const char* user;
const char* password;
serviceGetUser(service, &user, &password);
inst->service = service;
inst->user = MXS_STRDUP_A(service->credentials.name);
inst->password = MXS_STRDUP_A(service->credentials.authdata);
inst->user = MXS_STRDUP_A(user);
inst->password = MXS_STRDUP_A(password);
MXS_NOTICE("testbinlog v1.0");