Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv10716/apps

Modified Files:
        app_meetme.c 
Log Message:
issue #5680


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- app_meetme.c        8 Nov 2005 23:19:30 -0000       1.125
+++ app_meetme.c        11 Nov 2005 00:45:02 -0000      1.126
@@ -848,7 +848,7 @@
 
        time(&user->jointime);
 
-       if (conf->locked) {
+       if (conf->locked && (!(confflags & CONFFLAG_ADMIN))) {
                /* Sorry, but this confernce is locked! */      
                if (!ast_streamfile(chan, "conf-locked", chan->language))
                        ast_waitstream(chan, "");

_______________________________________________
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs

Reply via email to