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

Merge

Browse Source
This commit is contained in:
vraatikka
2013-08-19 16:40:44 +03:00
parent c119f7b7b8 b1c398e944
commit f750b8545a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/Makefile
View File

@ -103,10 +103,6 @@ depend:
install: maxscale maxkeys maxpasswd install: maxscale maxkeys maxpasswd
@mkdir -p $(DEST)/bin @mkdir -p $(DEST)/bin
install -D maxscale maxkeys maxpasswd $(DEST)/bin install -D maxscale maxkeys maxpasswd $(DEST)/bin
THIS=`pwd`
cd $(DEST)
- `./maxkeys $(DEST)/MaxScale/etc/.secrets`
cd $(THIS)
install -D $(MARIADB_SRC_PATH)/libmysqld/libmysqld.so.18 $(DEST)/lib install -D $(MARIADB_SRC_PATH)/libmysqld/libmysqld.so.18 $(DEST)/lib
include depend.mk include depend.mk

4
server/core/secrets.c
View File

@ -67,6 +67,10 @@ int fd;
home = "/usr/local/skysql/MaxScale"; home = "/usr/local/skysql/MaxScale";
sprintf(secret_file, "%s/etc/.secrets", home); sprintf(secret_file, "%s/etc/.secrets", home);
/* Silently check for a .secrets file */
if (access(secret_file, R_OK) == -1)
return NULL;
/* open secret file */ /* open secret file */
if ((fd = open(secret_file, O_RDONLY)) < 0) if ((fd = open(secret_file, O_RDONLY)) < 0)
{ {