diff options
| author | Matthew Jordan <mjordan@digium.com> | 2014-10-09 18:44:00 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2014-10-09 18:44:00 +0000 |
| commit | 3a187aa14aa1f412a7e880ff1045a11baf53724d (patch) | |
| tree | d12af173665d2175912dc01a5c24b897c5c78d28 /res/res_phoneprov.c | |
| parent | cc595f7353c4b2c5fc71223a8b1ded601e068e04 (diff) | |
res/res_phoneprov: Don't cancel Asterisk load on module load failure
........
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
Diffstat (limited to 'res/res_phoneprov.c')
| -rw-r--r-- | res/res_phoneprov.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index 8f71c2609..aa082c738 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -1376,7 +1376,7 @@ static int load_module(void) profiles = ao2_container_alloc(MAX_PROFILE_BUCKETS, phone_profile_hash_fn, phone_profile_cmp_fn); if (!profiles) { 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); @@ -1424,7 +1424,7 @@ error: ao2_cleanup(users); delete_providers(); ao2_cleanup(providers); - return -1; + return AST_MODULE_LOAD_DECLINE; } |