diff options
| author | Matthew Jordan <mjordan@digium.com> | 2014-10-10 14:31:02 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2014-10-10 14:31:02 +0000 |
| commit | b8aed5b14dd34027ba5dcc372f2ca7a013c67837 (patch) | |
| tree | f03e864c187fc5d8f942005d6f9bb1d21a54311f /res/res_phoneprov.c | |
| parent | 23ffd68e7009b58fcdd00ebff53188b334c95fe0 (diff) | |
res/res_phoneprov: Bail on registration if res_phoneprov didn't load
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@425221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_phoneprov.c')
| -rw-r--r-- | res/res_phoneprov.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index 7b7b3903b..fc38f2223 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -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); |