kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 272255 via svnmerge from

Browse Source 
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
This commit is contained in:
Paul Belanger
2010-06-23 21:00:00 +00:00
parent 9328d05d90
commit affec518d6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_meetme.c
View File

@@ -4140,10 +4140,11 @@ static int conf_exec(struct ast_channel *chan, const char *data)
res = -1; res = -1;
} }
} else { } else {
if ((!ast_strlen_zero(cnf->pin) && if (((!ast_strlen_zero(cnf->pin) &&
!ast_test_flag64(&confflags, CONFFLAG_ADMIN)) || !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] = ""; char pin[MAX_PIN] = "";
int j; int j;