dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Don't prompt for password if one is not needed (bug #2385) 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3728 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2004-09-05 19:38:17 +00:00
parent 03776ef875
commit bb4aa74eb5
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/app_voicemail.c
View File

@ -3617,13 +3617,20 @@ static int vm_execmain(struct ast_channel *chan, void *data)
}
if (useadsi)
adsi_password(chan);
if (ast_streamfile(chan, "vm-password", chan->language)) {
ast_log(LOG_WARNING, "Unable to stream password file\n");
goto out;
}
if (ast_readstring(chan, password, sizeof(password) - 1, 2000, 10000, "#") < 0) {
ast_log(LOG_WARNING, "Unable to read password\n");
goto out;
if (!skipuser)
vmu = find_user(&vmus, context, vms.username);
if (vmu && vmu->password[0] == '\0') {
/* saved password is blank, so don't bother asking */
password[0] = '\0';
} else {
if (ast_streamfile(chan, "vm-password", chan->language)) {
ast_log(LOG_WARNING, "Unable to stream password file\n");
goto out;
}
if (ast_readstring(chan, password, sizeof(password) - 1, 2000, 10000, "#") < 0) {
ast_log(LOG_WARNING, "Unable to read password\n");
goto out;
}
}
if (prefix) {
char fullusername[80] = "";
@ -3631,8 +3638,6 @@ static int vm_execmain(struct ast_channel *chan, void *data)
strncat(fullusername, vms.username, sizeof(fullusername) - 1);
strncpy(vms.username, fullusername, sizeof(vms.username) - 1);
}
if (!skipuser)
vmu = find_user(&vmus, context, vms.username);
if (vmu && !strcmp(vmu->password, password))
valid++;
else {