提交 1064bb04 authored 作者: Anthony Minessale's avatar Anthony Minessale 提交者: Muteesa Fred

FS-10784: [freeswitch-core] Make Users lists compatible with all forms of xml #resolve

上级 8f1b7e06
...@@ -1853,6 +1853,12 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate_user_in_domain(const char *use ...@@ -1853,6 +1853,12 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate_user_in_domain(const char *use
} }
} }
} }
} else {
if ((users = switch_xml_child(domain, "users"))) {
status = find_user_in_tag(users, NULL, user_name, "id", NULL, user);
} else {
status = find_user_in_tag(domain, NULL, user_name, "id", NULL, user);
}
} }
return status; return status;
...@@ -2145,8 +2151,12 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(const char *key, ...@@ -2145,8 +2151,12 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(const char *key,
} }
if (status != SWITCH_STATUS_SUCCESS) { if (status != SWITCH_STATUS_SUCCESS) {
if ((users = switch_xml_child(*domain, "users"))) {
status = find_user_in_tag(users, ip, user_name, key, params, user);
} else {
status = find_user_in_tag(*domain, ip, user_name, key, params, user); status = find_user_in_tag(*domain, ip, user_name, key, params, user);
} }
}
end: end:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论