issue #5680

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

2 files changed, 3 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1fd6288e8..cf4b9febf 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-10  Kevin P. Fleming  <kpfleming@digium.com>
 
+	* apps/app_meetme.c (conf_run): don't restrict admin users from joining a locked conference (issue #5680)
+
 	* channels/chan_misdn.c: include stdio.h (issue #5671)
 	* channels/chan_misdn_config.c: fix prototype warning (issue #5671)
 
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 9b4c618be..3bdb789d3 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -848,7 +848,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 
 	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, "");