]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
--resolve FS-3918 using patch that adds conference_moderator_pin channel variable
authorKen Rice <krice@freeswitch.org>
Wed, 3 Jul 2013 15:34:06 +0000 (10:34 -0500)
committerKen Rice <krice@freeswitch.org>
Wed, 3 Jul 2013 16:14:10 +0000 (11:14 -0500)
src/mod/applications/mod_conference/mod_conference.c

index 1e4990b66b9cca0c37ea13f5418e68d365680a0e..0f41cb39124c30b75256eda77ef0f625451aad26 100644 (file)
@@ -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;
                }