Index: apps/app_voicemail.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v retrieving revision 1.155 diff -u -r1.155 app_voicemail.c --- apps/app_voicemail.c 3 Oct 2004 21:18:26 -0000 1.155 +++ apps/app_voicemail.c 7 Oct 2004 00:33:42 -0000 @@ -3055,6 +3055,7 @@ return cmd; newpassword2[1] = '\0'; newpassword2[0] = cmd = ast_play_and_wait(chan,"vm-reenterpassword"); + if (cmd < 0 || cmd == 't' || cmd == '#') return cmd; cmd = ast_readstring(chan,newpassword2 + strlen(newpassword2),sizeof(newpassword2)-1,2000,10000,"#"); if (cmd < 0 || cmd == 't' || cmd == '#') Index: configs/voicemail.conf.sample =================================================================== RCS file: /usr/cvsroot/asterisk/configs/voicemail.conf.sample,v retrieving revision 1.41 diff -u -r1.41 voicemail.conf.sample --- configs/voicemail.conf.sample 2 Oct 2004 03:01:20 -0000 1.41 +++ configs/voicemail.conf.sample 7 Oct 2004 00:33:43 -0000 @@ -141,7 +141,6 @@ ;4069 => 6522,Matt Brooks,matt@marko.net,,|tz=central|attach=yes|saycid=yes|dialout=fromvm|callback=fromvm|review=yes|operator=yes|envelope=yes ;4073 => 1099,Bianca Paige,bianca@biancapaige.com,,delete=1 ;4110 => 3443,Rob Flynn,rflynn@blueridge.net -;4321 => 4321,Russell Bryant,russelb@clemson.edu,,|tz=central|attach=no|saycid=yes|dialout=fromvm|callback=fromvm|review=yes|operator=yes|envelope=yes|forcename=yes|forcegreetings=yes ;