diff options
author | Mark Spencer <markster@digium.com> | 2004-07-17 01:34:20 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2004-07-17 01:34:20 +0000 |
commit | 09c3679e2d6ab1932f98598945a74ac016d39fbd (patch) | |
tree | 48d0cc6d81273b67d8cf4de54f3f23918e343531 /apps/app_voicemail.c | |
parent | 6b8ecfa35f3cf012aedf84a9dd6565da3bd21593 (diff) |
Voicemail fixes (bug #1982)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_voicemail.c')
-rwxr-xr-x | apps/app_voicemail.c | 16 |
1 files changed, 11 insertions, 5 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); |