kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-18 09:32:34 +00:00
Code Issues Projects Releases Wiki Activity

mod_voicemail: Make the vm_fsdb_auth api use the new db-password-override value

Browse Source
This commit is contained in:
Marc Olivier Chouinard 2011-07-09 16:29:03 -04:00
parent a9db642a36
commit a3279a384c
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mod/applications/mod_voicemail/mod_voicemail.c
View File

@ -5131,7 +5131,7 @@ SWITCH_STANDARD_API(vm_fsdb_auth_login_function)
char user_db_password[64] = { 0 }; char user_db_password[64] = { 0 };
const char *user_xml_password = NULL; const char *user_xml_password = NULL;
switch_bool_t authorized = SWITCH_FALSE;
switch_event_t *params = NULL; switch_event_t *params = NULL;
switch_xml_t x_user = NULL; switch_xml_t x_user = NULL;
switch_bool_t vm_enabled = SWITCH_TRUE; switch_bool_t vm_enabled = SWITCH_TRUE;
@ -5191,25 +5191,33 @@ SWITCH_STANDARD_API(vm_fsdb_auth_login_function)
sql = switch_mprintf("SELECT password FROM voicemail_prefs WHERE username = '%q' AND domain = '%q'", id, domain); sql = switch_mprintf("SELECT password FROM voicemail_prefs WHERE username = '%q' AND domain = '%q'", id, domain);
vm_execute_sql2str(profile, profile->mutex, sql, user_db_password, sizeof(user_db_password)); vm_execute_sql2str(profile, profile->mutex, sql, user_db_password, sizeof(user_db_password));
switch_safe_free(sql); switch_safe_free(sql);
}
if (vm_enabled == SWITCH_FALSE) { if (vm_enabled == SWITCH_FALSE) {
stream->write_function(stream, "%s", "-ERR Login Denied"); stream->write_function(stream, "%s", "-ERR Login Denied");
} else if (!zstr(user_db_password)) { } else {
if (!zstr(user_db_password)) {
if (!strcasecmp(user_db_password, password)) { if (!strcasecmp(user_db_password, password)) {
stream->write_function(stream, "%s", "-OK"); authorized = SWITCH_TRUE;
} else {
stream->write_function(stream, "%s", "-ERR");
} }
} else if (!zstr(user_xml_password)) { if (!profile->db_password_override && !zstr(user_xml_password) && !strcasecmp(user_xml_password, password)) {
authorized = SWITCH_TRUE;
}
} else {
if (!zstr(user_xml_password)) {
if (!strcasecmp(user_xml_password, password)) { if (!strcasecmp(user_xml_password, password)) {
authorized = SWITCH_TRUE;
}
}
}
if (profile->allow_empty_password_auth && zstr(user_db_password) && zstr(user_xml_password)) {
authorized = SWITCH_TRUE;
}
if (authorized) {
stream->write_function(stream, "%s", "-OK"); stream->write_function(stream, "%s", "-OK");
} else { } else {
stream->write_function(stream, "%s", "-ERR"); stream->write_function(stream, "%s", "-ERR");
} }
} else { }
stream->write_function(stream, "%s", "-ERR");
} }
switch_xml_free(x_user); switch_xml_free(x_user);