kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-24 19:52:35 +00:00
Code Issues Projects Releases Wiki Activity

apply patch from MODAPP-156

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10199 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-10-30 00:52:11 +00:00
parent 0a5a51723d
commit 7afabe3c23
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
View File

@ -245,22 +245,24 @@ static abyss_bool http_directory_auth(TSession * r, char *domain_name)
} }
} }
if (!(mypass1 && mypass2)) { if (!switch_strlen_zero(mypass2) && !strcasecmp(mypass2, "user-choose")) {
mypass2 = NULL;
}
if (!mypass1) {
r->requestInfo.user = strdup(user); r->requestInfo.user = strdup(user);
goto authed; goto authed;
} else { } else {
if (mypass1) { if (at) {
if (at) { switch_snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass1);
switch_snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass1); } else {
} else { switch_snprintf(z, sizeof(z), "%s:%s", user, mypass1);
switch_snprintf(z, sizeof(z), "%s:%s", user, mypass1); }
} Base64Encode(z, t);
Base64Encode(z, t);
if (!strcmp(p, t)) { if (!strcmp(p, t)) {
r->requestInfo.user = strdup(box ? box : user); r->requestInfo.user = strdup(box ? box : user);
goto authed; goto authed;
}
} }
if (mypass2) { if (mypass2) {
@ -278,18 +280,16 @@ static abyss_bool http_directory_auth(TSession * r, char *domain_name)
} }
if (box) { if (box) {
if (mypass1) { if (at) {
if (at) { switch_snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass1);
switch_snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass1); } else {
} else { switch_snprintf(z, sizeof(z), "%s:%s", box, mypass1);
switch_snprintf(z, sizeof(z), "%s:%s", box, mypass1); }
} Base64Encode(z, t);
Base64Encode(z, t);
if (!strcmp(p, t)) { if (!strcmp(p, t)) {
r->requestInfo.user = strdup(box); r->requestInfo.user = strdup(box);
goto authed; goto authed;
}
} }
if (mypass2) { if (mypass2) {