[Asterisk-cvs] asterisk/apps app_voicemail.c,1.133,1.134

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory localhost.localdomain:/tmp/cvs-serv14273/apps

Modified Files:
	app_voicemail.c 
Log Message:
Voicemail fixes (bug #1982)


Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- app_voicemail.c	14 Jul 2004 07:34:34 -0000	1.133
+++ app_voicemail.c	17 Jul 2004 01:34:20 -0000	1.134
@@ -3567,13 +3567,19 @@
 			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);