kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

LBDING-16 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14929 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2009-09-20 20:18:02 +00:00
parent b2699403a0
commit df597d4dad
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/endpoints/mod_dingaling/mod_dingaling.c
View File

@ -2310,6 +2310,7 @@ static switch_bool_t match_profile(mdl_profile_t *profile, mdl_profile_t *new_pr
(new_profile->context && profile->context && !strcasecmp(new_profile->context, profile->context))) && (new_profile->context && profile->context && !strcasecmp(new_profile->context, profile->context))) &&
(new_profile->user_flags == profile->user_flags) && (new_profile->acl_count == profile->acl_count) (new_profile->user_flags == profile->user_flags) && (new_profile->acl_count == profile->acl_count)
) { ) {
int i;
if (switch_odbc_available()) { if (switch_odbc_available()) {
if(!( if(!(
((!new_profile->odbc_dsn && !profile->odbc_dsn) || ((!new_profile->odbc_dsn && !profile->odbc_dsn) ||
@ -2323,7 +2324,7 @@ static switch_bool_t match_profile(mdl_profile_t *profile, mdl_profile_t *new_pr
} }
} }
for(int i=0; i<new_profile->acl_count; i++) { for(i=0; i<new_profile->acl_count; i++) {
if(strcasecmp(new_profile->acl[i], profile->acl[i]) != 0) { if(strcasecmp(new_profile->acl[i], profile->acl[i]) != 0) {
return SWITCH_FALSE; return SWITCH_FALSE;
} }
@ -2378,6 +2379,7 @@ static switch_status_t soft_reload(void)
void *data = NULL; void *data = NULL;
switch_hash_t *name_hash; switch_hash_t *name_hash;
switch_hash_index_t *hi;
switch_core_hash_init(&name_hash, module_pool); switch_core_hash_init(&name_hash, module_pool);
if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
@ -2466,7 +2468,7 @@ static switch_status_t soft_reload(void)
switch_xml_free(xml); switch_xml_free(xml);
for (switch_hash_index_t *hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
switch_hash_this(hi, NULL, NULL, &data); switch_hash_this(hi, NULL, NULL, &data);
profile = (mdl_profile_t *) data; profile = (mdl_profile_t *) data;
@ -2477,7 +2479,7 @@ static switch_status_t soft_reload(void)
} }
} }
for (switch_hash_index_t *hi = switch_hash_first(NULL, name_hash); hi; hi = switch_hash_next(hi)) { for (hi = switch_hash_first(NULL, name_hash); hi; hi = switch_hash_next(hi)) {
switch_hash_this(hi, NULL, NULL, &data); switch_hash_this(hi, NULL, NULL, &data);
if((profile = switch_core_hash_find(globals.profile_hash, (char*)data))) { if((profile = switch_core_hash_find(globals.profile_hash, (char*)data))) {