From ac44e94f2f0e978941a1d29b89f3926cc66ebf3e Mon Sep 17 00:00:00 2001
From: Warren Dukes <warren.dukes@gmail.com>
Date: Thu, 28 Oct 2004 05:30:22 +0000
Subject: [PATCH] fix user being parsed as a path

git-svn-id: https://svn.musicpd.org/mpd/trunk@2377 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/audioOutput.c | 2 ++
 src/main.c        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/audioOutput.c b/src/audioOutput.c
index 0175ed04f..902edbccb 100644
--- a/src/audioOutput.c
+++ b/src/audioOutput.c
@@ -91,6 +91,8 @@ void closeAudioOutput(AudioOutput * audioOutput) {
 void finishAudioOutput(AudioOutput * audioOutput) {
 	closeAudioOutput(audioOutput);
 	audioOutput->finishDriverFunc(audioOutput);
+	free(audioOutput->type);
+	free(audioOutput->name);
 	free(audioOutput);
 }
 
diff --git a/src/main.c b/src/main.c
index f56d74939..d4732f046 100644
--- a/src/main.c
+++ b/src/main.c
@@ -201,7 +201,7 @@ void parseOptions(int argc, char ** argv, Options * options) {
                         options->logFile = parseConfigFilePath(CONF_LOG_FILE,1);
                         options->errorFile = 
 				parseConfigFilePath(CONF_ERROR_FILE, 1);
-                        options->usr = parseConfigFilePath(CONF_USER, 0);
+                        options->usr = getConfigParamValue(CONF_USER);
                         options->dbFile = parseConfigFilePath(CONF_DB_FILE, 0);
                         return;
                 }