aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-01 20:29:49 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-01 20:29:49 +0000
commit848e595dcabe5e345c7dbbc79ddca1ab7c3d6843 (patch)
tree092641cefd3b976a8a2310a88f230cdb3e20e6b1
parent3ae15bee03fa5caf35b035e23bc094665a6405ea (diff)
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 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273529 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_meetme.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index d2ff16da1..c42d19d22 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -3881,8 +3881,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
} 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;