From 6707d6d0cfd9e96fe2292ddc73ded3196d7f63d5 Mon Sep 17 00:00:00 2001
From: VilhoRaatikka <vilho.raatikka@skysql.com>
Date: Tue, 14 Oct 2014 18:13:04 +0300
Subject: [PATCH] Complamentatry fix to that of #575. resolve_maxscale_homedir
 returned always false due to succp variable which wasn't updated in
 successful case.

---
 server/core/gateway.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/server/core/gateway.c b/server/core/gateway.c
index 4131366a4..58a7153e5 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -539,7 +539,7 @@ return_succp:
 static bool resolve_maxscale_homedir(
         char** p_home_dir)
 {
-        bool  succp = false;
+        bool  succp;
         char* tmp;
         char* log_context = NULL;
         
@@ -627,15 +627,25 @@ check_home_dir:
 			
 			free(errstr);
 			free(logstr);
+			succp = false;
 		}
-		else if (!daemon_mode)
+		else 
 		{
-			fprintf(stderr,
-				"Using %s as MAXSCALE_HOME = %s\n",
-				log_context,
-				tmp);
+			succp = true;
+			
+			if (!daemon_mode)
+			{
+				fprintf(stderr,
+					"Using %s as MAXSCALE_HOME = %s\n",
+					log_context,
+					tmp);
+			}
 		}
 	}
+	else
+	{
+		succp = false;
+	}
 	free (tmp);
 
         if (log_context != NULL)
@@ -1392,7 +1402,7 @@ int main(int argc, char **argv)
         {
                 if (!resolve_maxscale_homedir(&home_dir))
                 {
-                        ss_dassert(home_dir == NULL);
+                        ss_dassert(home_dir != NULL);
                         rc = MAXSCALE_HOMELESS;
                         goto return_main;
                 }