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.4@273474 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index a13844e9a87b1f2471f3657e7b42db2d26d00036..c25d8929d8bdca46cfe75ac80da7542ce9894c6f 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2889,8 +2889,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;