diff options
| author | Kinsey Moore <kmoore@digium.com> | 2011-11-09 17:15:44 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2011-11-09 17:15:44 +0000 |
| commit | c1647ab33a82c6af9fe321395f3ddeb7cb758735 (patch) | |
| tree | f656ea1e99d7ceb5702d270b4e8f58948f39ae85 /apps/app_meetme.c | |
| parent | 5203e0f552624936bbf5ac893c8de888f40ede5d (diff) | |
Fix pin parameter behavior regression in MeetMe
The last time this code was touched (by me), a subtlety was missed based on the
difference between needing to check a pin's validity and the need to prompt
for a pin.
(closes issue ASTERISK-18488)
........
Merged revisions 344102 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 344103 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@344104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -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 dc2df7b21..469200e78 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -4458,13 +4458,14 @@ static int conf_exec(struct ast_channel *chan, const char *data) res = -1; } } else { - /* Check to see if the conference requires a pin - * and we ALWAYS prompt or no pin was provided */ + /* Check to see if the conference requires pin + * validation and check for exemptions to that + * requirement. */ if ((!ast_strlen_zero(cnf->pin) || (!ast_strlen_zero(cnf->pinadmin) && ast_test_flag64(&confflags, CONFFLAG_ADMIN))) && (ast_test_flag64(&confflags, CONFFLAG_ALWAYSPROMPT) || - ast_strlen_zero(args.pin))) { + ast_strlen_zero(args.pin) || !cnf->isdynamic)) { char pin[MAX_PIN] = ""; int j; |