[asterisk-commits] bbryant: branch 1.8 r311615 - /branches/1.8/apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Wed Mar 23 16:54:11 2011
New Revision: 311615

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311615
Log:
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:
    branches/1.8/apps/app_meetme.c

Modified: branches/1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_meetme.c?view=diff&rev=311615&r1=311614&r2=311615
==============================================================================
--- branches/1.8/apps/app_meetme.c (original)
+++ branches/1.8/apps/app_meetme.c Wed Mar 23 16:54:11 2011
@@ -4316,11 +4316,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;