From 1cc6ced505c47e18757d09388b5923b4a2677abc Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Mon, 27 Apr 2015 15:06:45 +0300
Subject: [PATCH] Updated old references to MAXSCALE_HOME

---
 server/core/adminusers.c | 26 +++++---------------------
 server/core/load_utils.c | 11 -----------
 server/core/maxkeys.c    | 24 +++++++++++++-----------
 server/include/modules.h |  1 -
 4 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/server/core/adminusers.c b/server/core/adminusers.c
index 64ea5f224..e20f9d1c3 100644
--- a/server/core/adminusers.c
+++ b/server/core/adminusers.c
@@ -26,6 +26,7 @@
 #include <adminusers.h>
 #include <skygw_utils.h>
 #include <log_manager.h>
+#include <gwdirs.h>
 
 /** Defined in log_manager.cc */
 extern int            lm_enabled_logfiles_bitmask;
@@ -119,12 +120,7 @@ char	fname[1024], *home;
 char	uname[80], passwd[80];
 
 	initialise();
-	if ((home = getenv("MAXSCALE_HOME")) != NULL && strlen(home) < 1024){
-		sprintf(fname, "%s/etc/passwd", home);
-	}
-	else{
-		sprintf(fname, "/usr/local/mariadb-maxscale/etc/passwd");
-	}
+    sprintf(fname, "%s/passwd", get_cachedir());
 	if ((fp = fopen(fname, "r")) == NULL)
 		return NULL;
 	if ((rval = users_alloc()) == NULL)
@@ -155,12 +151,7 @@ FILE	*fp;
 char	fname[1024], *home, *cpasswd;
 
 	initialise();
-	if ((home = getenv("MAXSCALE_HOME")) != NULL && strlen(home) < 1024){
-		sprintf(fname, "%s/etc/passwd", home);
-	}
-	else{
-		sprintf(fname, "/usr/local/mariadb-maxscale/etc/passwd");
-	}
+    sprintf(fname, "%s/passwd", get_cachedir());
         
 	if (users == NULL)
 	{
@@ -253,15 +244,8 @@ char* admin_remove_user(
         /**
          * Open passwd file and remove user from the file.
          */
-        if ((home = getenv("MAXSCALE_HOME")) != NULL &&
-	    strnlen(home,PATH_MAX) < PATH_MAX &&
-	    strnlen(home,PATH_MAX) > 0) {
-                sprintf(fname, "%s/etc/passwd", home);
-                sprintf(fname_tmp, "%s/etc/passwd_tmp", home);
-        } else {
-                sprintf(fname, "/usr/local/mariadb-maxscale/etc/passwd");
-                sprintf(fname_tmp, "/usr/local/mariadb-maxscale/etc/passwd_tmp");
-        }
+        sprintf(fname, "%s/passwd", get_cachedir());
+        sprintf(fname_tmp, "%s/passwd_tmp", get_cachedir());
         /**
          * Rewrite passwd file from memory.
          */
diff --git a/server/core/load_utils.c b/server/core/load_utils.c
index 9451f6838..7e4a10c37 100644
--- a/server/core/load_utils.c
+++ b/server/core/load_utils.c
@@ -105,17 +105,6 @@ WriteMemoryCallback(void *contents, size_t size, size_t nmemb, void *userp)
 	return realsize;
 }
 
-char* get_maxscale_home(void)
-{
-        char* home = getenv("MAXSCALE_HOME");
-        if (home == NULL)
-        {
-                home = "/usr/local/mariadb-maxscale";
-        }
-        return home;
-}
-                
-
 /**
  * Load the dynamic library related to a gateway module. The routine
  * will look for library files in the current directory, 
diff --git a/server/core/maxkeys.c b/server/core/maxkeys.c
index 0d5c938ff..6cb4501ec 100644
--- a/server/core/maxkeys.c
+++ b/server/core/maxkeys.c
@@ -31,6 +31,7 @@
 #include	<secrets.h>
 #include <skygw_utils.h>
 #include <log_manager.h>
+#include <gwdirs.h>
 int main(int argc, char **argv)
 {
     int arg_count = 3;
@@ -52,19 +53,20 @@ int main(int argc, char **argv)
 	    return 1;
 	}
 
+	if(access("/var/log/maxscale/maxkeys/",F_OK) != 0)
+	{
+            if(mkdir("/var/log/maxscale/maxkeys/",0777) == -1)
+            {
+		if(errno != EEXIST)
+		{
+		    fprintf(stderr,"Error: %d - %s",errno,strerror(errno));
+		    return 1;
+		}
+            }
+	}
 	arg_vector[0] = strdup("logmanager");
 	arg_vector[1] = strdup("-j");
-
-	if ((home = getenv("MAXSCALE_HOME")) != NULL)
-	{
-	    arg_vector[2] = (char*)malloc((strlen(home) + strlen("/log"))*sizeof(char));
-	    sprintf(arg_vector[2],"%s/log",home);
-	}
-	else
-	{
-	    arg_vector[2] = strdup("/usr/local/mariadb-maxscale/log");
-	}
-
+	arg_vector[2] = strdup("/var/log/maxscale/maxkeys");
 	arg_vector[3] = NULL;
 	skygw_logmanager_init(arg_count,arg_vector);
 	skygw_log_enable(LOGFILE_TRACE);
diff --git a/server/include/modules.h b/server/include/modules.h
index 51e10b29d..96d322402 100644
--- a/server/include/modules.h
+++ b/server/include/modules.h
@@ -68,7 +68,6 @@ extern	void	unload_all_modules();
 extern	void	printModules();
 extern	void	dprintAllModules(DCB *);
 extern 	RESULTSET	*moduleGetList();
-extern	char	*get_maxscale_home(void);
 extern void module_feedback_send(void*);
 extern void moduleShowFeedbackReport(DCB *dcb);