提交 c0711320 authored 作者: Michael Jerris's avatar Michael Jerris

MDXMLINT-45 Allow setting of global realm without a global user

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10920 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 e6db92f6
......@@ -95,11 +95,13 @@ static switch_status_t do_config(void)
if (!globals.port) {
globals.port = 8080;
}
if (user && pass && realm) {
if (realm) {
set_global_realm(realm);
if (user && pass) {
set_global_user(user);
set_global_pass(pass);
}
}
switch_xml_free(xml);
return SWITCH_STATUS_SUCCESS;
......@@ -194,6 +196,7 @@ static abyss_bool http_directory_auth(TSession * r, char *domain_name)
goto fail;
}
if (!switch_strlen_zero(globals.user)) {
switch_snprintf(z, sizeof(z), "%s:%s", globals.user, globals.pass);
Base64Encode(z, t);
......@@ -201,6 +204,7 @@ static abyss_bool http_directory_auth(TSession * r, char *domain_name)
r->requestInfo.user = strdup(user);
goto authed;
}
}
switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
switch_assert(params);
......@@ -496,7 +500,7 @@ abyss_bool handler_hook(TSession * r)
}
}
if (!fs_user || !strcmp(fs_user, globals.user)) {
if (!fs_user || (!switch_strlen_zero(globals.user) && !strcmp(fs_user, globals.user))) {
auth = 1;
} else {
if (!j) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论