diff options
| author | Brett Bryant <bbryant@digium.com> | 2011-03-23 21:55:54 +0000 |
|---|---|---|
| committer | Brett Bryant <bbryant@digium.com> | 2011-03-23 21:55:54 +0000 |
| commit | c31d7b21ea4dcc68ea2fe81092f9f2aa6f2ce813 (patch) | |
| tree | 9e16febfaf85e47bbc69ed257deb5f8fba7e940d /apps/app_meetme.c | |
| parent | 15f633294d27ca47abfef7f2a608750b3374e886 (diff) | |
Merged revisions 311615 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r311615 | bbryant | 2011-03-23 17:54:11 -0400 (Wed, 23 Mar 2011) | 8 lines
This patch fixes a bug with MeetMe behavior where the 'P' option for always
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/trunk@311616 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 50090dd57..1d30b2ca7 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -4400,11 +4400,12 @@ static int conf_exec(struct ast_channel *chan, const char *data) if (((!ast_strlen_zero(cnf->pin) && !ast_test_flag64(&confflags, CONFFLAG_ADMIN)) || (!ast_strlen_zero(cnf->pinadmin) && - ast_test_flag64(&confflags, CONFFLAG_ADMIN)) || - (!ast_strlen_zero(cnf->pin) && - ast_strlen_zero(cnf->pinadmin) && - ast_test_flag64(&confflags, CONFFLAG_ADMIN))) && - (!(cnf->users == 0 && cnf->isdynamic))) { + ast_test_flag64(&confflags, CONFFLAG_ADMIN)) || + (!ast_strlen_zero(cnf->pin) && + ast_strlen_zero(cnf->pinadmin) && + ast_test_flag64(&confflags, CONFFLAG_ADMIN))) && + ((!(cnf->users == 0 && cnf->isdynamic)) || + ast_test_flag64(&confflags, CONFFLAG_ALWAYSPROMPT))) { char pin[MAX_PIN] = ""; int j; |