[asterisk-commits] kmoore: trunk r344104 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Nov  9 11:15:44 2011
New Revision: 344104

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=344104
Log:
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

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=344104&r1=344103&r2=344104
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Nov  9 11:15:44 2011
@@ -4458,13 +4458,14 @@
 					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;