From a4408e62a6ca1bc36e26109396af332d05fae812 Mon Sep 17 00:00:00 2001 From: Ken Rice Date: Wed, 3 Jul 2013 10:34:06 -0500 Subject: [PATCH] --resolve FS-3918 using patch that adds conference_moderator_pin channel variable --- src/mod/applications/mod_conference/mod_conference.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 1e4990b66b..0f41cb3912 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -7355,7 +7355,7 @@ SWITCH_STANDARD_APP(conference_function) switch_core_session_message_t msg = { 0 }; uint8_t rl = 0, isbr = 0; char *dpin = ""; - char *mdpin = ""; + const char *mdpin = ""; conf_xml_cfg_t xml_cfg = { 0 }; switch_event_t *params = NULL; int locked = 0; @@ -7597,6 +7597,9 @@ SWITCH_STANDARD_APP(conference_function) rl++; } + /* Moderator PIN as a channel variable */ + mdpin = switch_channel_get_variable(channel, "conference_moderator_pin"); + if (zstr(dpin) && conference->pin) { dpin = conference->pin; }