kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

res/res_phoneprov: Bail on registration if res_phoneprov didn't load

Browse Source 
If res_phoneprov failed to fully load (due to not being configured), the
providers container will be NULL. If a module attempts to register a phone
provisioning provider, it should check for the presence of the container.
If there is no providers container, it should return an error.

This patch makes the ast_phoneprov_provider_register function do that...
otherwise this would be a silly commit message.
........

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@425222 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-10-10 14:31:42 +00:00
parent c46100ad5f
commit c3ff212cae
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_phoneprov.c
View File

@@ -1502,6 +1502,11 @@ int ast_phoneprov_provider_register(char *provider_name,
return -1;
}
if (!providers) {
ast_log(LOG_WARNING, "Provider '%s' cannot be registered: res_phoneprov not loaded.\n", provider_name);
return -1;
}
provider = find_provider(provider_name);
if (provider) {
ast_log(LOG_ERROR, "There is already a provider registered named '%s'.\n", provider_name);