First caller into a dynamic conference now enter pin once.

If MeetMe is configured to use dynamic conference
numbers, then the first caller (which creates the
conference) had to enter the PIN number twice.

(closes issue #15878)
Reported by: shawkris
Patches:
      issue15878.patch uploaded by pabelanger (license 224)
Tested by: pabelanger

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@272255 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 7872a96b2d92620bf075017d01cac19ceccaf019..5fed964d849e505657cce067c7d0cc45daaad336 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2873,10 +2873,11 @@ static int conf_exec(struct ast_channel *chan, void *data)
                                if (allowretry)
                                        confno[0] = '\0';
                        } else {
-                               if ((!ast_strlen_zero(cnf->pin) &&
-                                    !ast_test_flag(&confflags, CONFFLAG_ADMIN)) ||
+                               if (((!ast_strlen_zero(cnf->pin) &&
+                                   !ast_test_flag(&confflags, CONFFLAG_ADMIN)) ||
                                    (!ast_strlen_zero(cnf->pinadmin) &&
-                                    ast_test_flag(&confflags, CONFFLAG_ADMIN))) {
+                                   ast_test_flag(&confflags, CONFFLAG_ADMIN))) &&
+                                   (!(cnf->users == 0 && cnf->isdynamic))) {
                                        char pin[MAX_PIN] = "";
                                        int j;