[asterisk-commits] bbryant: trunk r311616 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Wed Mar 23 16:55:54 2011
New Revision: 311616

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

........
  r311615 | bbryant | 2011-03-23 17:54:11 -0400 (Wed, 23 Mar 2011) | 8 lines
  
  This patch fixes a bug with MeetMe behavior where the 'P' option for always
  prompting for a pin is ignored for the first caller.
  
  (closes issue #18070)
  Reported by: mav3rick
  
  Review: https://reviewboard.asterisk.org/r/1132/
........

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-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=311616&r1=311615&r2=311616
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Mar 23 16:55:54 2011
@@ -4400,11 +4400,12 @@
 				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_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))) {
 					char pin[MAX_PIN] = "";
 					int j;