Voicemail fixes (bug #1982)

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

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 (skipuser || logretries >= maxlogins) {
+				if (ast_streamfile(chan, "vm-incorrect", chan->language))
+					break;
+			} else {
 				if (useadsi)
 					adsi_login(chan);
-			if (ast_streamfile(chan, "vm-incorrect", chan->language))
+				if (ast_streamfile(chan, "vm-incorrect-mailbox", chan->language))
 					break;
 			}
-		logretries++;
+			ast_waitstream(chan, "");
+		}
 	}
 	if (!valid && (logretries >= maxlogins)) {
 		ast_stopstream(chan);

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.