From: Ken Rice <krice@freeswitch.org>
Date: Wed, 3 Jul 2013 15:34:06 +0000 (-0500)
Subject: --resolve FS-3918 using patch that adds conference_moderator_pin channel variable
X-Git-Tag: v1.5.3~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f91bdf12aa1854da04775933a40f444e613775b5;p=thirdparty%2Ffreeswitch.git

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

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 50bf670aad..7abdd9710c 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -7359,7 +7359,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;
@@ -7601,6 +7601,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;
 		}