From: Raymond Chandler <intralanman@gmail.com>
Date: Sat, 5 Jan 2013 01:53:00 +0000 (-0500)
Subject: don't disable conference if conference-set-profile is disallowed and set expand-vars... 
X-Git-Tag: v1.3.13~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5462ea69acca4deb82569c3258f33b987bbc1d19;p=thirdparty%2Ffreeswitch.git

don't disable conference if conference-set-profile is disallowed and set expand-vars permission to match code
---

diff --git a/src/mod/applications/mod_httapi/conf/autoload_configs/httapi.conf.xml b/src/mod/applications/mod_httapi/conf/autoload_configs/httapi.conf.xml
index c2fe584a02..68ab548183 100644
--- a/src/mod/applications/mod_httapi/conf/autoload_configs/httapi.conf.xml
+++ b/src/mod/applications/mod_httapi/conf/autoload_configs/httapi.conf.xml
@@ -55,7 +55,7 @@
 	    <application name="hangup"/>
 	  </application-list>
 	</permission>
-	<permission name="expand-vars-in-tag-body" value="false">
+	<permission name="expand-vars" value="false">
 	  <!-- default to "deny" or "allow" -->
 	  <!-- type attr can be "deny" or "allow" nothing defaults to opposite of the list default so allow in this case -->
 	  <!-- 
diff --git a/src/mod/applications/mod_httapi/mod_httapi.c b/src/mod/applications/mod_httapi/mod_httapi.c
index 275e2f47ff..617a07baa0 100644
--- a/src/mod/applications/mod_httapi/mod_httapi.c
+++ b/src/mod/applications/mod_httapi/mod_httapi.c
@@ -24,6 +24,7 @@
  * Contributor(s):
  * 
  * Anthony Minessale II <anthm@freeswitch.org>
+ * Raymond Chandler <intralanman@freeswitch.org>
  *
  * mod_httapi.c -- HT-TAPI Hypertext Telephony API
  *
@@ -1987,7 +1988,7 @@ static switch_status_t do_config(void)
 				} else if (!strcasecmp(var, "conference")) {
 					profile->perms.conference.enabled = switch_true(val);
 				} else if (!strcasecmp(var, "conference-set-profile")) {
-					profile->perms.conference.enabled = switch_true(val);
+					if (switch_true(val)) profile->perms.conference.enabled = SWITCH_TRUE;
 					profile->perms.conference.set_profile = switch_true(val);
 				}