diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-23 20:57:01 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-23 20:57:01 +0000 |
| commit | 9e599ec66c6d428f8247db9bcbe2b7684e430374 (patch) | |
| tree | 996d17e062605d5be1aeeef5b2c06ec28e9e8cc9 | |
| parent | 2578e87abb0c78a0931a636dbc58b7306584f83b (diff) | |
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.4@272255 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 7872a96b2..5fed964d8 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2873,10 +2873,11 @@ static int conf_exec(struct ast_channel *chan, void *data) if (allowretry) confno[0] = '\0'; } 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; |