From 09c3679e2d6ab1932f98598945a74ac016d39fbd Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Sat, 17 Jul 2004 01:34:20 +0000
Subject: [PATCH] Voicemail fixes (bug #1982)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_voicemail.c            |  16 +++++++++++-----
 sounds.txt                      |   4 +++-
 sounds/vm-incorrect-mailbox.gsm | Bin 0 -> 4554 bytes
 sounds/vm-incorrect.gsm         | Bin 4554 -> 2805 bytes
 4 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100755 sounds/vm-incorrect-mailbox.gsm

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 40d9e9217e..af7aa80b4c 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 4a6276d47d..92ea6e6c2c 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 0000000000000000000000000000000000000000..899340758d70f3fbea10ff7457ba766955734d20
GIT binary patch
literal 4554
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
SE6B;bU<`157aClMhWtNPxJfVo

literal 0
HcmV?d00001

diff --git a/sounds/vm-incorrect.gsm b/sounds/vm-incorrect.gsm
index 899340758d70f3fbea10ff7457ba766955734d20..fd42267cf36d1ae714bc31721b938c0e7f626aab 100755
GIT binary patch
literal 2805
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
H7HeXDY?!JH

literal 4554
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
SE6B;bU<`157aClMhWtNPxJfVo