Voicemail fixes (bug #1982)

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 40d9e9217e903820f88934d68a618a37a2f1a28f..af7aa80b4ca55b40bfde79838afd4898b937b4b8 100755 (executable)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3567,13 +3567,19 @@ static int vm_execmain(struct ast_channel *chan, void *data)
                        if (prefix)
                                strncpy(vms.username, empty, sizeof(vms.username) -1);
                }
+               logretries++;
                if (!valid) {
-                       if (useadsi)
-                               adsi_login(chan);
-                       if (ast_streamfile(chan, "vm-incorrect", chan->language))
-                               break;
+                       if (skipuser || logretries >= maxlogins) {
+                               if (ast_streamfile(chan, "vm-incorrect", chan->language))
+                                       break;
+                       } else {
+                               if (useadsi)
+                                       adsi_login(chan);
+                               if (ast_streamfile(chan, "vm-incorrect-mailbox", chan->language))
+                                       break;
+                       }
+                       ast_waitstream(chan, "");
                }
-               logretries++;
        }
        if (!valid && (logretries >= maxlogins)) {
                ast_stopstream(chan);

diff --git a/sounds.txt b/sounds.txt
index 4a6276d47d8f4eb14714c90d7c79b6201d59c023..92ea6e6c2c337411cd72bdc5a6171b89174cb738 100755 (executable)
--- a/sounds.txt
+++ b/sounds.txt
@@ -128,7 +128,9 @@
 
 %vm-INBOX.gsm%new
 
-%vm-incorrect.gsm%Login incorrect.  Mailbox?
+%vm-incorrect-mailbox.gsm%Login incorrect.  Mailbox?
+
+%vm-incorrect.gsm%Login incorrect.
 
 %vm-instructions.gsm%To look into your messages press 1 now.  You may quit voicemail at any time by pressing the pound key.
 

diff --git a/sounds/vm-incorrect-mailbox.gsm b/sounds/vm-incorrect-mailbox.gsm
new file mode 100755 (executable)
index 0000000..8993407
Binary files /dev/null and b/sounds/vm-incorrect-mailbox.gsm differ

diff --git a/sounds/vm-incorrect.gsm b/sounds/vm-incorrect.gsm
index 899340758d70f3fbea10ff7457ba766955734d20..fd42267cf36d1ae714bc31721b938c0e7f626aab 100755 (executable)
Binary files a/sounds/vm-incorrect.gsm and b/sounds/vm-incorrect.gsm differ