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

This patch fixes a bug with MeetMe behavior where the 'P' option for always

Browse Source 
prompting for a pin is ignored for the first caller.

(closes issue #18070)
Reported by: mav3rick

Review: https://reviewboard.asterisk.org/r/1132/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@311615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Brett Bryant
2011-03-23 21:54:11 +00:00
parent a54ab29087
commit 51ce432d07
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/app_meetme.c
View File

@@ -4316,11 +4316,12 @@ static int conf_exec(struct ast_channel *chan, const char *data)
if (((!ast_strlen_zero(cnf->pin) && if (((!ast_strlen_zero(cnf->pin) &&
!ast_test_flag64(&confflags, CONFFLAG_ADMIN)) || !ast_test_flag64(&confflags, CONFFLAG_ADMIN)) ||
(!ast_strlen_zero(cnf->pinadmin) && (!ast_strlen_zero(cnf->pinadmin) &&
ast_test_flag64(&confflags, CONFFLAG_ADMIN)) || ast_test_flag64(&confflags, CONFFLAG_ADMIN)) ||
(!ast_strlen_zero(cnf->pin) && (!ast_strlen_zero(cnf->pin) &&
ast_strlen_zero(cnf->pinadmin) && ast_strlen_zero(cnf->pinadmin) &&
ast_test_flag64(&confflags, CONFFLAG_ADMIN))) && ast_test_flag64(&confflags, CONFFLAG_ADMIN))) &&
(!(cnf->users == 0 && cnf->isdynamic))) { ((!(cnf->users == 0 && cnf->isdynamic)) ||
ast_test_flag64(&confflags, CONFFLAG_ALWAYSPROMPT))) {
char pin[MAX_PIN] = ""; char pin[MAX_PIN] = "";
int j; int j;