mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2025-02-02 15:07:36 -05:00
Allow icelogin to coexist with http login. icelogin is still deprecated,
and now a warning is issued. svn path=/trunk/icecast/; revision=3985
This commit is contained in:
parent
b620ee918d
commit
a6edc8f631
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user