fix voicemail account setup (bug #2077)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3961 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 7571308..5f0b9b2 100755 (executable)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2949,6 +2949,7 @@ static int vm_newuser(struct ast_channel *chan, struct ast_vm_user *vmu, struct
                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 == '#')

diff --git a/configs/voicemail.conf.sample b/configs/voicemail.conf.sample
index 9dd76fc..cee4a41 100755 (executable)
--- a/configs/voicemail.conf.sample
+++ b/configs/voicemail.conf.sample
@@ -141,7 +141,6 @@ central24=America/Chicago|'vm-received' q 'digits/at' H 'digits/hundred' M 'hour
 ;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
 
 
 ;