Voicemail fixes (bug #1982)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3453 f38db490-d61c-443f-a65b-d21fe96a405b

4 files changed, 14 insertions, 6 deletions

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 40d9e9217..af7aa80b4 100755
--- 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 4a6276d47..92ea6e6c2 100755
--- 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
index 000000000..899340758
--- /dev/null
+++ b/sounds/vm-incorrect-mailbox.gsm
diff --git a/sounds/vm-incorrect.gsm b/sounds/vm-incorrect.gsm
index 899340758..fd42267cf 100755
--- a/sounds/vm-incorrect.gsm
+++ b/sounds/vm-incorrect.gsm