[svn-commits] jpeeler: branch 1.4 r273474 - /branches/1.4/apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Thu Jul  1 15:19:16 2010
New Revision: 273474

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273474
Log:
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

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=273474&r1=273473&r2=273474
==============================================================================
--- branches/1.4/apps/app_meetme.c (original)
+++ branches/1.4/apps/app_meetme.c Thu Jul  1 15:19:16 2010
@@ -2889,8 +2889,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;