From 8ab621a913b9b798baffd8d562e639872c8e91f0 Mon Sep 17 00:00:00 2001 From: pabelanger Date: Wed, 23 Jun 2010 21:00:00 +0000 Subject: Merged revisions 272255 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r272255 | pabelanger | 2010-06-23 16:57:01 -0400 (Wed, 23 Jun 2010) | 12 lines First caller into a dynamic conference now enter pin once. If MeetMe is configured to use dynamic conference numbers, then the first caller (which creates the conference) had to enter the PIN number twice. (closes issue #15878) Reported by: shawkris Patches: issue15878.patch uploaded by pabelanger (license 224) Tested by: pabelanger ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@272257 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_meetme.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'apps') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index f632bef5c..8b24b3c5c 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -4140,10 +4140,11 @@ static int conf_exec(struct ast_channel *chan, const char *data) res = -1; } } else { - if ((!ast_strlen_zero(cnf->pin) && - !ast_test_flag64(&confflags, CONFFLAG_ADMIN)) || + if (((!ast_strlen_zero(cnf->pin) && + !ast_test_flag(&confflags, CONFFLAG_ADMIN)) || (!ast_strlen_zero(cnf->pinadmin) && - ast_test_flag64(&confflags, CONFFLAG_ADMIN))) { + ast_test_flag(&confflags, CONFFLAG_ADMIN))) && + (!(cnf->users == 0 && cnf->isdynamic))) { char pin[MAX_PIN] = ""; int j; -- cgit v1.2.3