[asterisk-commits] jpeeler: branch 1.6.2 r273529 - in /branches/1.6.2: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Jul  1 15:29:49 2010
New Revision: 273529

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

................
  r273522 | jpeeler | 2010-07-01 15:28:15 -0500 (Thu, 01 Jul 2010) | 21 lines
  
  Merged revisions 273474 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r273474 | jpeeler | 2010-07-01 15:19:16 -0500 (Thu, 01 Jul 2010) | 14 lines
    
    Allow admin user to join conference without using admin mode and no user pin.
    
    Configuring the conference in meetme.conf like the following:
    conf => 2345,,6666 
    did not prompt for pin when used without admin mode. This meant that the
    conference could not be joined as an admin even if the user knew the correct
    pin. The original bug report was submitted claiming that the blank user pin
    should deny entry into the conference. I think a better way to handle this
    would be with a feature enhancement that used the following syntax:
    conf => 2345,X,6666 - where X denotes no acceptable pin allowed
    
    (closes issue #15704)
    Reported by: modelnine
  ........
................

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=273529&r1=273528&r2=273529
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Thu Jul  1 15:29:49 2010
@@ -3881,8 +3881,7 @@
 			} else {
 				if (((!ast_strlen_zero(cnf->pin) &&
 				    !ast_test_flag(&confflags, CONFFLAG_ADMIN)) ||
-				    (!ast_strlen_zero(cnf->pinadmin) &&
-				    ast_test_flag(&confflags, CONFFLAG_ADMIN))) &&
+				    !ast_strlen_zero(cnf->pinadmin)) &&
 				    (!(cnf->users == 0 && cnf->isdynamic))) {
 					char pin[MAX_PIN] = "";
 					int j;