don't disable conference if conference-set-profile is disallowed and set expand-vars...

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 c2fe584a02d9eda8ba21ca75600ce40da31f470b..68ab548183f4acd6a1ccd144ab32af2366eefa60 100644 (file)
--- 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 275e2f47ff65c3cbe57b60ad0224bdb41938791d..617a07baa0d4ca2333e49baa2c22747b69e65674 100644 (file)
--- 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);
                                }