aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-02-02 15:07:36 -05:00
Code

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

Browse Source 
and now a warning is issued.

svn path=/trunk/icecast/; revision=3985
This commit is contained in:
Michael Smith 2002-10-10 08:50:58 +00:00
parent b620ee918d
commit a6edc8f631
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/connection.c
View File

@ -404,13 +404,19 @@ static int _check_relay_pass(http_parser_t *parser)
static int _check_source_pass(http_parser_t *parser) static int _check_source_pass(http_parser_t *parser)
{ {
char *pass = config_get_config()->source_password; char *pass = config_get_config()->source_password;
int ret;
if(!pass) if(!pass)
pass = ""; pass = "";
if(config_get_config()->ice_login) ret = _check_pass_http(parser, "source", pass);
return _check_pass_ice(parser, pass); if(!ret && config_get_config()->ice_login)
else {
return _check_pass_http(parser, "source", pass); 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, static void _handle_source_request(connection_t *con,