From ab5279ee3c16bde7fb5a50e7fc74062168b3c259 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Wed, 13 Nov 2013 08:26:18 +0000 Subject: [PATCH] Make sofia.conf.lua hostname backwards compatible. --- .../resources/scripts/configuration/sofia.conf.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua index f723d60fc6..d5515244ad 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua @@ -60,7 +60,7 @@ sql = "select p.sip_profile_name, p.sip_profile_description, s.sip_profile_setting_name, s.sip_profile_setting_value "; sql = sql .. "from v_sip_profiles as p, v_sip_profile_settings as s "; sql = sql .. "where s.sip_profile_setting_enabled = 'true' "; - sql = sql .. "and p.sip_profile_hostname = '" .. hostname.. "' "; + sql = sql .. "and (p.sip_profile_hostname = '" .. hostname.. "' or p.sip_profile_hostname is null or p.sip_profile_hostname = '') "; sql = sql .. "and p.sip_profile_uuid = s.sip_profile_uuid "; sql = sql .. "order by p.sip_profile_name asc "; if (debug["sql"]) then @@ -243,7 +243,7 @@ end --set the cache - result = trim(api:execute("memcache", "set configuration:sofia.conf:" .. hostname .."'"..XML_STRING:gsub("'", "'").."' "..expire["sofia.conf"])); + result = trim(api:execute("memcache", "set configuration:sofia.conf:" .. hostname .." '"..XML_STRING:gsub("'", "'").."' "..expire["sofia.conf"])); --send the xml to the console if (debug["xml_string"]) then