aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2007-02-06 03:25:29 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2007-02-06 03:25:29 +0000
commitc5933a164a2b25352becda8b0f103b42bc646348 (patch)
tree397ed3ddbd75261b4506f3dd0e30cd9e0e425498
parent79ef8ba2480eef73d5863945e270c539e7b4aac6 (diff)
downloadmpd-c5933a164a2b25352becda8b0f103b42bc646348.tar.gz
mpd-c5933a164a2b25352becda8b0f103b42bc646348.tar.xz
mpd-c5933a164a2b25352becda8b0f103b42bc646348.zip
Fix a bug where mpd would complain about a proxy password being specified
and not a proxy user even when both are specified. git-svn-id: https://svn.musicpd.org/mpd/trunk@5324 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/inputStream_http.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/inputStream_http.c b/src/inputStream_http.c
index 5df85fb67..46015553e 100644
--- a/src/inputStream_http.c
+++ b/src/inputStream_http.c
@@ -102,14 +102,14 @@ void inputStream_initHttp(void)
}
proxyPassword = param->value;
- }
-
- param = getConfigParam(CONF_HTTP_PROXY_PASSWORD);
+ } else {
+ param = getConfigParam(CONF_HTTP_PROXY_PASSWORD);
- if (param) {
- ERROR("%s specified but not %s\n",
- CONF_HTTP_PROXY_PASSWORD, CONF_HTTP_PROXY_USER);
- exit(EXIT_FAILURE);
+ if (param) {
+ ERROR("%s specified but not %s\n",
+ CONF_HTTP_PROXY_PASSWORD, CONF_HTTP_PROXY_USER);
+ exit(EXIT_FAILURE);
+ }
}
} else if ((param = getConfigParam(CONF_HTTP_PROXY_PORT))) {
ERROR("%s specified but not %s, line %i\n",