From bb11f6236f45bb8e16f68ff7a27de6ba5f564396 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Thu, 2 Oct 2014 09:44:30 +0300
Subject: [PATCH] Related to #145, http://bugs.mariadb.com/show_bug.cgi?id=145
 If .secrets file is not used it means that encrypted password is not used.
 Moved log entry away from error log and placed it to message log. It still
 prints it multiple times though.

---
 server/core/secrets.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/server/core/secrets.c b/server/core/secrets.c
index 9ea0819a5..c0b82c347 100644
--- a/server/core/secrets.c
+++ b/server/core/secrets.c
@@ -74,16 +74,29 @@ int             len;
 	snprintf(secret_file, 255, "%s/etc/.secrets", home);
 
 	/* Try to access secrets file */
-	if (access(secret_file, R_OK) == -1) {
+	if (access(secret_file, R_OK) == -1) 
+	{
                 int eno = errno;
                 errno = 0;
-                LOGIF(LE, (skygw_log_write_flush(
-                        LOGFILE_ERROR,
-                        "Error : access for secrets file "
-                        "[%s] failed. Error %d, %s.",
-                        secret_file,
-                        eno,
-                        strerror(eno))));
+		if (eno == ENOENT)
+		{
+			LOGIF(LM, (skygw_log_write(
+				LOGFILE_MESSAGE,
+				"Encrypted password file %s can't be accessed "
+				"(%s). Password encryption is not used.",
+				secret_file,
+				strerror(eno))));
+		}
+		else
+		{
+			LOGIF(LE, (skygw_log_write_flush(
+				LOGFILE_ERROR,
+				"Error : access for secrets file "
+				"[%s] failed. Error %d, %s.",
+				secret_file,
+				eno,
+				strerror(eno))));
+		}
 		return NULL;
         }