Merged revisions 272255 via svnmerge from
authorPaul Belanger <paul.belanger@polybeacon.com>
Wed, 23 Jun 2010 21:00:00 +0000 (21:00 +0000)
committerPaul Belanger <paul.belanger@polybeacon.com>
Wed, 23 Jun 2010 21:00:00 +0000 (21:00 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r272255 | pabelanger | 2010-06-23 16:57:01 -0400 (Wed, 23 Jun 2010) | 12 lines

  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/trunk@272257 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

index f632bef..8b24b3c 100644 (file)
@@ -4140,10 +4140,11 @@ static int conf_exec(struct ast_channel *chan, const char *data)
                                        res = -1;
                                }
                        } else {
                                        res = -1;
                                }
                        } else {
-                               if ((!ast_strlen_zero(cnf->pin) &&
-                                    !ast_test_flag64(&confflags, CONFFLAG_ADMIN)) ||
+                               if (((!ast_strlen_zero(cnf->pin) &&
+                                   !ast_test_flag(&confflags, CONFFLAG_ADMIN)) ||
                                    (!ast_strlen_zero(cnf->pinadmin) &&
                                    (!ast_strlen_zero(cnf->pinadmin) &&
-                                    ast_test_flag64(&confflags, CONFFLAG_ADMIN))) {
+                                   ast_test_flag(&confflags, CONFFLAG_ADMIN))) &&
+                                   (!(cnf->users == 0 && cnf->isdynamic))) {
                                        char pin[MAX_PIN] = "";
                                        int j;
 
                                        char pin[MAX_PIN] = "";
                                        int j;