src/client/main.c

@@ -532,9 +532,9 @@ int main(int argc, char **argv)
 		/* setup readline support */
 		UseRL=1;
 		rl_readline_name = "Milliways";
-		rl_attempted_completion_function= (CPPFunction *)complete_entry;
-		rl_completion_entry_function= (CPFunction *)dummy_list;
-		rl_directory_rewrite_hook= (Function *)expand_script_dir;
+		rl_attempted_completion_function = complete_entry;
+		rl_completion_entry_function = dummy_list;
+		rl_directory_rewrite_hook = expand_script_dir;
 	}
 
 	signal(SIGPIPE,SIG_IGN);

src/server/servercfg.c

@@ -145,7 +145,7 @@ static int cfg_load_default_path(void)
 	const char *etcconf;
 	int ret;
 
-	homedir = secure_getenv("HOME");
+	homedir = getenv("HOME");
 	if (homedir) {
 		ret = asprintf(&homeconf, "%s/.mwserv.conf", homedir);
 		if (ret > 0) {