[asterisk-commits] kmoore: branch 1.10 r328771 - in /branches/1.10: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Jul 19 10:46:54 2011
New Revision: 328771

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=328771
Log:
Merged revisions 328770 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r328770 | kmoore | 2011-07-19 10:43:32 -0500 (Tue, 19 Jul 2011) | 11 lines
  
  MeetMe requests a PIN twice in some circumstances
  
  If a call to MeetMe includes both the dynamic(D) and always request PIN(P)
  options, MeetMe will ask for the PIN two times: once for creating the
  conference and once for entering the conference.  This behavior was introduced
  in rev 311616 when adding the CONFFLAG_ALWAYSPROMPT option to the logic branch
  controlling PIN entry for joining a conference.
  
  (closes AST-601)
  Review: https://reviewboard.asterisk.org/r/1305/
........

Modified:
    branches/1.10/   (props changed)
    branches/1.10/apps/app_meetme.c

Propchange: branches/1.10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/1.10/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.10/apps/app_meetme.c?view=diff&rev=328771&r1=328770&r2=328771
==============================================================================
--- branches/1.10/apps/app_meetme.c (original)
+++ branches/1.10/apps/app_meetme.c Tue Jul 19 10:46:54 2011
@@ -4419,15 +4419,13 @@
 					res = -1;
 				}
 			} 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->pin) &&
-							 ast_strlen_zero(cnf->pinadmin) &&
-							 ast_test_flag64(&confflags, CONFFLAG_ADMIN))) &&
-				    ((!(cnf->users == 0 && cnf->isdynamic)) ||
-						ast_test_flag64(&confflags, CONFFLAG_ALWAYSPROMPT))) {
+				/* Check to see if the conference requires a pin
+				 * and we ALWAYS prompt or no pin was provided */
+				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))) {
 					char pin[MAX_PIN] = "";
 					int j;