kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

res/res_phoneprov: Don't cancel Asterisk load on module load failure

Browse Source 
........

Merged revisions 424985 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 424986 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@424987 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-10-09 18:44:00 +00:00
parent cc595f7353
commit 3a187aa14a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_phoneprov.c
View File

@@ -1376,7 +1376,7 @@ static int load_module(void)
profiles = ao2_container_alloc(MAX_PROFILE_BUCKETS, phone_profile_hash_fn, phone_profile_cmp_fn); profiles = ao2_container_alloc(MAX_PROFILE_BUCKETS, phone_profile_hash_fn, phone_profile_cmp_fn);
if (!profiles) { if (!profiles) {
ast_log(LOG_ERROR, "Unable to allocate profiles container.\n"); ast_log(LOG_ERROR, "Unable to allocate profiles container.\n");
return -1; return AST_MODULE_LOAD_DECLINE;
} }
http_routes = ao2_container_alloc(MAX_ROUTE_BUCKETS, http_route_hash_fn, http_route_cmp_fn); http_routes = ao2_container_alloc(MAX_ROUTE_BUCKETS, http_route_hash_fn, http_route_cmp_fn);
@@ -1424,7 +1424,7 @@ error:
ao2_cleanup(users); ao2_cleanup(users);
delete_providers(); delete_providers();
ao2_cleanup(providers); ao2_cleanup(providers);
return -1; return AST_MODULE_LOAD_DECLINE;
} }