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

Update with various small fixes

Browse Source 
Update with various small fixes
This commit is contained in:
MassimilianoPinto
2015-07-29 14:33:45 +02:00
parent 2d6780288a
commit a28936c5bf
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/modules/routing/binlog/blr.c
View File

@ -180,7 +180,8 @@ ROUTER_INSTANCE *inst;
char *value, *name; char *value, *name;
int i; int i;
unsigned char *defuuid; unsigned char *defuuid;
char path[PATH_MAX], filename[PATH_MAX]; char path[PATH_MAX+1] = "";
char filename[PATH_MAX+1] = "";
int master_info = 0; int master_info = 0;
int rc = 0; int rc = 0;
@ -462,9 +463,9 @@ int rc = 0;
rc = ini_parse(filename, blr_handler_config, inst); rc = ini_parse(filename, blr_handler_config, inst);
LOGIF(LT, (skygw_log_write_flush(LOGFILE_TRACE, LOGIF(LT, (skygw_log_write_flush(LOGFILE_TRACE,
"%s: %s/master.ini parse result is %d", "%s: %s parse result is %d",
inst->service->name, inst->service->name,
inst->binlogdir, filename,
rc))); rc)));
/* /*
@ -1324,7 +1325,7 @@ blr_statistics(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue)
{ {
char result[1000], *ptr; char result[1000], *ptr;
GWBUF *ret; GWBUF *ret;
int len; unsigned long len;
snprintf(result, 1000, snprintf(result, 1000,
"Uptime: %u Threads: %u Events: %u Slaves: %u Master State: %s", "Uptime: %u Threads: %u Events: %u Slaves: %u Master State: %s",
@ -1358,7 +1359,6 @@ blr_ping(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue)
{ {
char *ptr; char *ptr;
GWBUF *ret; GWBUF *ret;
int len;
if ((ret = gwbuf_alloc(5)) == NULL) if ((ret = gwbuf_alloc(5)) == NULL)
return 0; return 0;
@ -1566,6 +1566,7 @@ char *service_passwd = NULL;
"create hex_sha1_sha1_password failed for service user %s", "create hex_sha1_sha1_password failed for service user %s",
service_user))); service_user)));
free(dpwd);
return 1; return 1;
} }
@ -1584,15 +1585,14 @@ int
blr_load_dbusers(ROUTER_INSTANCE *router) blr_load_dbusers(ROUTER_INSTANCE *router)
{ {
int loaded; int loaded;
char path[4097]; char path[PATH_MAX+1] = "";
SERVICE *service; SERVICE *service;
service = router->service; service = router->service;
/* File path for router cached authentication data */ /* File path for router cached authentication data */
strcpy(path, router->binlogdir); strncpy(path, router->binlogdir, PATH_MAX);
strncat(path, "/cache", 4096); strncat(path, "/cache", PATH_MAX);
strncat(path, "/dbusers", PATH_MAX);
strncat(path, "/dbusers", 4096);
/* Try loading dbusers from configured backends */ /* Try loading dbusers from configured backends */
loaded = load_mysql_users(service); loaded = load_mysql_users(service);
@ -1653,14 +1653,14 @@ int
blr_save_dbusers(ROUTER_INSTANCE *router) blr_save_dbusers(ROUTER_INSTANCE *router)
{ {
SERVICE *service; SERVICE *service;
char path[4097]; char path[PATH_MAX+1] = "";
int mkdir_rval; int mkdir_rval;
service = router->service; service = router->service;
/* File path for router cached authentication data */ /* File path for router cached authentication data */
strcpy(path, router->binlogdir); strncpy(path, router->binlogdir, PATH_MAX);
strncat(path, "/cache", 4096); strncat(path, "/cache", PATH_MAX);
/* check and create dir */ /* check and create dir */
if (access(path, R_OK) == -1) if (access(path, R_OK) == -1)
@ -1681,7 +1681,7 @@ int mkdir_rval;
} }
/* set cache file name */ /* set cache file name */
strncat(path, "/dbusers", 4096); strncat(path, "/dbusers", PATH_MAX);
return dbusers_save(service->users, path); return dbusers_save(service->users, path);