res/res_phoneprov: Don't cancel Asterisk load on module load failure
authorMatthew Jordan <mjordan@digium.com>
Thu, 9 Oct 2014 18:44:00 +0000 (18:44 +0000)
committerMatthew Jordan <mjordan@digium.com>
Thu, 9 Oct 2014 18:44:00 +0000 (18:44 +0000)
........

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

res/res_phoneprov.c

index 8f71c26..aa082c7 100644 (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);
        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;
 
 }