Merge

server/core/Makefile

@@ -103,10 +103,6 @@ depend:
 install: maxscale maxkeys maxpasswd
 	@mkdir -p $(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
 
 include depend.mk

server/core/secrets.c

@@ -67,6 +67,10 @@ int		fd;
 		home = "/usr/local/skysql/MaxScale";
 	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 */
 	if ((fd = open(secret_file, O_RDONLY)) < 0)
 	{