[svn-commits] pabelanger: branch 1.4 r272255 - /branches/1.4/apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Wed Jun 23 15:57:01 2010
New Revision: 272255

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=272255
Log:
First caller into a dynamic conference now enter pin once.

If MeetMe is configured to use dynamic conference
numbers, then the first caller (which creates the
conference) had to enter the PIN number twice.

(closes issue #15878)
Reported by: shawkris
Patches:
      issue15878.patch uploaded by pabelanger (license 224)
Tested by: pabelanger

Modified:
    branches/1.4/apps/app_meetme.c

Modified: branches/1.4/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_meetme.c?view=diff&rev=272255&r1=272254&r2=272255
==============================================================================
--- branches/1.4/apps/app_meetme.c (original)
+++ branches/1.4/apps/app_meetme.c Wed Jun 23 15:57:01 2010
@@ -2873,10 +2873,11 @@
 				if (allowretry)
 					confno[0] = '\0';
 			} else {
-				if ((!ast_strlen_zero(cnf->pin) &&
-				     !ast_test_flag(&confflags, CONFFLAG_ADMIN)) ||
+				if (((!ast_strlen_zero(cnf->pin) &&
+				    !ast_test_flag(&confflags, CONFFLAG_ADMIN)) ||
 				    (!ast_strlen_zero(cnf->pinadmin) &&
-				     ast_test_flag(&confflags, CONFFLAG_ADMIN))) {
+				    ast_test_flag(&confflags, CONFFLAG_ADMIN))) &&
+				    (!(cnf->users == 0 && cnf->isdynamic))) {
 					char pin[MAX_PIN] = "";
 					int j;