diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-01 20:28:15 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-01 20:28:15 +0000 |
| commit | f57bd9716b3cc9a4c7152e4d2c6e754064fa5874 (patch) | |
| tree | 409d99b04ad86119a4cad8852ce6f4bc417f6399 /apps/app_meetme.c | |
| parent | 65145d4e188d45bb9b8012fd865636137733ba9e (diff) | |
Merged revisions 273474 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r273474 | jpeeler | 2010-07-01 15:19:16 -0500 (Thu, 01 Jul 2010) | 14 lines
Allow admin user to join conference without using admin mode and no user pin.
Configuring the conference in meetme.conf like the following:
conf => 2345,,6666
did not prompt for pin when used without admin mode. This meant that the
conference could not be joined as an admin even if the user knew the correct
pin. The original bug report was submitted claiming that the blank user pin
should deny entry into the conference. I think a better way to handle this
would be with a feature enhancement that used the following syntax:
conf => 2345,X,6666 - where X denotes no acceptable pin allowed
(closes issue #15704)
Reported by: modelnine
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@273522 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 0cfd8986c..36c29cfe4 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -4154,8 +4154,7 @@ static int conf_exec(struct ast_channel *chan, const char *data) } else { 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->pinadmin)) && (!(cnf->users == 0 && cnf->isdynamic))) { char pin[MAX_PIN] = ""; int j; |