kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pin parameter behavior regression in MeetMe

Browse Source 
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
This commit is contained in:
Kinsey Moore
2011-11-09 17:15:44 +00:00
parent 5203e0f552
commit c1647ab33a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_meetme.c
View File

@@ -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;