From: Rupa Schomaker <rupa@rupa.com>
Date: Wed, 7 Jul 2010 04:43:56 +0000 (-0500)
Subject: mod_lcr: don't validate profiles with ${} vars since they are dynamic
X-Git-Tag: v1.2-rc1~563^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af33afaa613f9ef333af1701a99e4b5a32f7dd6e;p=thirdparty%2Ffreeswitch.git

mod_lcr: don't validate profiles with ${} vars since they are dynamic
  and we can't guess what the proper value should be
---

diff --git a/src/mod/applications/mod_lcr/mod_lcr.c b/src/mod/applications/mod_lcr/mod_lcr.c
old mode 100755
new mode 100644
index 0e45be39de..c16b575043
--- a/src/mod/applications/mod_lcr/mod_lcr.c
+++ b/src/mod/applications/mod_lcr/mod_lcr.c
@@ -1146,7 +1146,9 @@ static switch_status_t lcr_load_config()
 				switch_core_hash_insert(globals.profile_hash, profile->name, profile);
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loaded lcr profile %s.\n", profile->name);
 				/* test the profile */
-				if (test_profile(profile->name) == SWITCH_TRUE) {
+				if (profile->custom_sql_has_vars) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "custom_sql has channel vars, skipping verification and assuming valid profile: %s.\n", profile->name);
+				} else if (test_profile(profile->name) == SWITCH_TRUE) {
 					if (!strcasecmp(profile->name, "default")) {
 						globals.default_profile = profile;
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Setting user defined default profile: %s.\n", profile->name);