mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-20 16:50:14 +00:00
don't allow '#' as a voicemail password (bug #3066)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4465 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3124,19 +3124,24 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct
|
|||||||
}
|
}
|
||||||
newpassword[1] = '\0';
|
newpassword[1] = '\0';
|
||||||
newpassword[0] = cmd = ast_play_and_wait(chan,"vm-newpassword");
|
newpassword[0] = cmd = ast_play_and_wait(chan,"vm-newpassword");
|
||||||
if (cmd < 0)
|
if (cmd == '#')
|
||||||
break;
|
newpassword[0] = '\0';
|
||||||
if ((cmd = ast_readstring(chan,newpassword + strlen(newpassword),sizeof(newpassword)-1,2000,10000,"#")) < 0) {
|
else {
|
||||||
break;
|
if (cmd < 0)
|
||||||
}
|
break;
|
||||||
|
if ((cmd = ast_readstring(chan,newpassword + strlen(newpassword),sizeof(newpassword)-1,2000,10000,"#")) < 0)
|
||||||
|
break;
|
||||||
|
}
|
||||||
newpassword2[1] = '\0';
|
newpassword2[1] = '\0';
|
||||||
newpassword2[0] = cmd = ast_play_and_wait(chan,"vm-reenterpassword");
|
newpassword2[0] = cmd = ast_play_and_wait(chan,"vm-reenterpassword");
|
||||||
if (cmd < 0)
|
if (cmd == '#')
|
||||||
break;
|
newpassword2[0] = '\0';
|
||||||
|
else {
|
||||||
if ((cmd = ast_readstring(chan,newpassword2 + strlen(newpassword2),sizeof(newpassword2)-1,2000,10000,"#"))) {
|
if (cmd < 0)
|
||||||
break;
|
break;
|
||||||
}
|
if ((cmd = ast_readstring(chan,newpassword2 + strlen(newpassword2),sizeof(newpassword2)-1,2000,10000,"#")))
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (strcmp(newpassword, newpassword2)) {
|
if (strcmp(newpassword, newpassword2)) {
|
||||||
ast_log(LOG_NOTICE,"Password mismatch for user %s (%s != %s)\n", vms->username, newpassword, newpassword2);
|
ast_log(LOG_NOTICE,"Password mismatch for user %s (%s != %s)\n", vms->username, newpassword, newpassword2);
|
||||||
cmd = ast_play_and_wait(chan, "vm-mismatch");
|
cmd = ast_play_and_wait(chan, "vm-mismatch");
|
||||||
|
|||||||
Reference in New Issue
Block a user