kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

issue #5680

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7064 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-11-11 00:45:02 +00:00
parent f603eb0135
commit c79c0f97f1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,5 +1,7 @@
2005-11-10 Kevin P. Fleming <kpfleming@digium.com> 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.c: include stdio.h (issue #5671)
* channels/chan_misdn_config.c: fix prototype warning (issue #5671) * channels/chan_misdn_config.c: fix prototype warning (issue #5671)

2
apps/app_meetme.c
View File

@@ -848,7 +848,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
time(&user->jointime); time(&user->jointime);
if (conf->locked) { if (conf->locked && (!(confflags & CONFFLAG_ADMIN))) {
/* Sorry, but this confernce is locked! */ /* Sorry, but this confernce is locked! */
if (!ast_streamfile(chan, "conf-locked", chan->language)) if (!ast_streamfile(chan, "conf-locked", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");