Commit a6edc8f6 authored by Michael Smith's avatar Michael Smith

Allow icelogin to coexist with http login. icelogin is still deprecated,

and now a warning is issued.

svn path=/trunk/icecast/; revision=3985
parent b620ee91
......@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment