kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-30 07:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_voicemail.c: Allow mailbox entry on authentication retry prompt." into 15

Browse Source
This commit is contained in:
Jenkins2
2017-07-26 06:55:56 -05:00
committed by Gerrit Code Review
parent 29a746c534 85c631294a
commit a11f5fb51a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app_voicemail.c
View File

@@ -11064,7 +11064,7 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_
int skipuser, int max_logins, int silent)
{
int useadsi = 0, valid = 0, logretries = 0;
char password[AST_MAX_EXTENSION]="", *passptr;
char password[AST_MAX_EXTENSION], *passptr;
struct ast_vm_user vmus, *vmu = NULL;
/* If ADSI is supported, setup login screen */
@@ -11106,7 +11106,8 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_
adsi_password(chan);
if (!ast_strlen_zero(prefix)) {
char fullusername[80] = "";
char fullusername[80];
ast_copy_string(fullusername, prefix, sizeof(fullusername));
strncat(fullusername, mailbox, sizeof(fullusername) - 1 - strlen(fullusername));
ast_copy_string(mailbox, fullusername, mailbox_size);
@@ -11164,6 +11165,10 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_
free_user(vmu);
return -1;
}
if (ast_waitstream(chan, "")) { /* Channel is hung up */
free_user(vmu);
return -1;
}
} else {
if (useadsi)
adsi_login(chan);
@@ -11173,10 +11178,6 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_
return -1;
}
}
if (ast_waitstream(chan, "")) { /* Channel is hung up */
free_user(vmu);
return -1;
}
}
}
if (!valid && (logretries >= max_logins)) {