[asterisk-commits] pabelanger: branch 1.6.2 r272258 - in /branches/1.6.2: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Wed Jun 23 16:01:47 2010
New Revision: 272258

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=272258
Log:
Merged revisions 272257 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r272257 | pabelanger | 2010-06-23 17:00:00 -0400 (Wed, 23 Jun 2010) | 19 lines
  
  Merged revisions 272255 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r272255 | pabelanger | 2010-06-23 16:57:01 -0400 (Wed, 23 Jun 2010) | 12 lines
    
    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.6.2/   (props changed)
    branches/1.6.2/apps/app_meetme.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_meetme.c?view=diff&rev=272258&r1=272257&r2=272258
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Wed Jun 23 16:01:47 2010
@@ -3867,10 +3867,11 @@
 					res = -1;
 				}
 			} 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;