Author: mjordan
Date: Fri Oct 10 09:30:43 2014
New Revision: 425220
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425220
Log:
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.
Modified:
branches/12/res/res_phoneprov.c
Modified: branches/12/res/res_phoneprov.c
URL:
http://svnview.digium.com/svn/asterisk/branches/12/res/res_phoneprov.c?view=diff&rev=425220&r1=425219&r2=425220
==============================================================================
--- branches/12/res/res_phoneprov.c (original)
+++ branches/12/res/res_phoneprov.c Fri Oct 10 09:30:43 2014
@@ -1501,6 +1501,11 @@
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);
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
