diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-23 21:01:47 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-23 21:01:47 +0000 |
| commit | a665318c5d542c3da2dd54393f06b69626cc7e9e (patch) | |
| tree | fa11cdd352be7ccfb53836173d6c8f7de327415d | |
| parent | 264057cc425532e0b2b884221162a67c30f24ba2 (diff) | |
Merged revisions 272257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r272257 | pabelanger | 2010-06-23 17:00:00 -0400 (Wed, 23 Jun 2010) | 19 lines
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/branches/1.6.2@272258 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_meetme.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 4990b899f..5fe842447 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -3867,10 +3867,11 @@ static int conf_exec(struct ast_channel *chan, void *data) res = -1; } } else { - if ((!ast_strlen_zero(cnf->pin) && - !ast_test_flag(&confflags, CONFFLAG_ADMIN)) || + if (((!ast_strlen_zero(cnf->pin) && + !ast_test_flag(&confflags, CONFFLAG_ADMIN)) || (!ast_strlen_zero(cnf->pinadmin) && - ast_test_flag(&confflags, CONFFLAG_ADMIN))) { + ast_test_flag(&confflags, CONFFLAG_ADMIN))) && + (!(cnf->users == 0 && cnf->isdynamic))) { char pin[MAX_PIN] = ""; int j; |