kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 7955 via svnmerge from

Browse Source 
/branches/1.2


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7956 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-01-11 01:31:28 +00:00
parent 466a062b09
commit bdc14f3c84
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_voicemail.c
View File

@@ -5621,10 +5621,10 @@ static int vm_box_exists(struct ast_channel *chan, void *data)
static int vmauthenticate(struct ast_channel *chan, void *data) static int vmauthenticate(struct ast_channel *chan, void *data)
{ {
struct localuser *u; struct localuser *u;
char *s = data, *user=NULL, *context=NULL, mailbox[AST_MAX_EXTENSION]; char *s = data, *user=NULL, *context=NULL, mailbox[AST_MAX_EXTENSION] = "";
struct ast_vm_user vmus; struct ast_vm_user vmus;
char *options = NULL; char *options = NULL;
int silent = 0; int silent = 0, skipuser = 0;
int res = -1; int res = -1;
LOCAL_USER_ADD(u); LOCAL_USER_ADD(u);
@@ -5641,6 +5641,9 @@ static int vmauthenticate(struct ast_channel *chan, void *data)
s = user; s = user;
user = strsep(&s, "@"); user = strsep(&s, "@");
context = strsep(&s, ""); context = strsep(&s, "");
if (!ast_strlen_zero(user))
skipuser++;
ast_copy_string(mailbox, user, sizeof(mailbox));
} }
} }
@@ -5648,9 +5651,10 @@ static int vmauthenticate(struct ast_channel *chan, void *data)
silent = (strchr(options, 's')) != NULL; silent = (strchr(options, 's')) != NULL;
} }
if (!vm_authenticate(chan, mailbox, sizeof(mailbox), &vmus, context, NULL, 0, 3, silent)) { if (!vm_authenticate(chan, mailbox, sizeof(mailbox), &vmus, context, NULL, skipuser, 3, silent)) {
pbx_builtin_setvar_helper(chan, "AUTH_MAILBOX", mailbox); pbx_builtin_setvar_helper(chan, "AUTH_MAILBOX", mailbox);
pbx_builtin_setvar_helper(chan, "AUTH_CONTEXT", vmus.context); pbx_builtin_setvar_helper(chan, "AUTH_CONTEXT", vmus.context);
ast_play_and_wait(chan, "auth-thankyou");
res = 0; res = 0;
} }