From b1c398e9444c9193f8a524b07ed08b1b4e308b09 Mon Sep 17 00:00:00 2001
From: Mark Riddoch <mriddoch@ks211278.kimsufi.com>
Date: Mon, 19 Aug 2013 15:36:26 +0200
Subject: [PATCH] Bug 145 - Silently ignore missing .secrets file

---
 server/core/Makefile  | 4 ----
 server/core/secrets.c | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/core/Makefile b/server/core/Makefile
index e5d456500..8fb068c78 100644
--- a/server/core/Makefile
+++ b/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
diff --git a/server/core/secrets.c b/server/core/secrets.c
index f05b2bfb8..8498f131e 100644
--- a/server/core/secrets.c
+++ b/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)
 	{