Merged revisions 168705 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r168705 | seanbright | 2009-01-15 10:33:18 -0500 (Thu, 15 Jan 2009) | 11 lines

  Add a missing unlock and properly handle the 'maxusers' setting on MeetMe
  conferences.  We were using the 'user number' field to compare against the
  maximum allowed users, which works assuming users with lower user numbers
  didn't leave the conference.

  (closes issue #14117)
  Reported by: sergedevorop
  Patches:
        20090114__bug14117-2.diff.txt uploaded by seanbright (license 71)
  Tested by: sergedevorop
........

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 924e0e1bacc42803514cc5f299af0cc859a55234..3b47f1b86e29687bf478f730717931726c2d2f0c 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1809,10 +1809,12 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                user->user_no = AST_LIST_LAST(&conf->userlist)->user_no + 1;
 
        if (rt_schedule && conf->maxusers)
-               if (user->user_no > conf->maxusers) {
+               if (conf->users >= conf->maxusers) {
                        /* Sorry, but this confernce has reached the participant limit! */      
                        if (!ast_streamfile(chan, "conf-full", chan->language))
                                ast_waitstream(chan, "");
+                       ast_mutex_unlock(&conf->playlock);
+                       user->user_no = 0;
                        goto outrun;
                }