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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273529 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index d2ff16da1e1ac89444bb595f45b42a96e85935ed..c42d19d2232f5965b0b51b2a9300ada03db72477 100644 (file)
--- 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;