From a6edc8f631345dcb973802f09d2cca008d3a156f Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 10 Oct 2002 08:50:58 +0000 Subject: [PATCH] Allow icelogin to coexist with http login. icelogin is still deprecated, and now a warning is issued. svn path=/trunk/icecast/; revision=3985 --- src/connection.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/connection.c b/src/connection.c index bf80a6c3..c0fdec8e 100644 --- a/src/connection.c +++ b/src/connection.c @@ -404,13 +404,19 @@ static int _check_relay_pass(http_parser_t *parser) static int _check_source_pass(http_parser_t *parser) { char *pass = config_get_config()->source_password; + int ret; if(!pass) pass = ""; - if(config_get_config()->ice_login) - return _check_pass_ice(parser, pass); - else - return _check_pass_http(parser, "source", pass); + ret = _check_pass_http(parser, "source", pass); + if(!ret && config_get_config()->ice_login) + { + ret = _check_pass_ice(parser, pass); + if(ret) + WARN0("Source is using deprecated icecast login"); + } + + return ret; } static void _handle_source_request(connection_t *con,