--resolve FS-3918 using patch that adds conference_moderator_pin channel variable

This commit is contained in:
Ken Rice 2013-07-03 10:34:06 -05:00
parent fa174ec3d8
commit f91bdf12aa

View File

@ -7359,7 +7359,7 @@ SWITCH_STANDARD_APP(conference_function)
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t msg = { 0 };
uint8_t rl = 0, isbr = 0; uint8_t rl = 0, isbr = 0;
char *dpin = ""; char *dpin = "";
char *mdpin = ""; const char *mdpin = "";
conf_xml_cfg_t xml_cfg = { 0 }; conf_xml_cfg_t xml_cfg = { 0 };
switch_event_t *params = NULL; switch_event_t *params = NULL;
int locked = 0; int locked = 0;
@ -7601,6 +7601,9 @@ SWITCH_STANDARD_APP(conference_function)
rl++; rl++;
} }
/* Moderator PIN as a channel variable */
mdpin = switch_channel_get_variable(channel, "conference_moderator_pin");
if (zstr(dpin) && conference->pin) { if (zstr(dpin) && conference->pin) {
dpin = conference->pin; dpin = conference->pin;
} }