diff options
author | Matt O'Gorman <mogorman@digium.com> | 2006-08-31 21:00:20 +0000 |
---|---|---|
committer | Matt O'Gorman <mogorman@digium.com> | 2006-08-31 21:00:20 +0000 |
commit | 05a695af721cb8002f3d462c6952f45f0e9c5d9e (patch) | |
tree | 5eac7fd790352b502dbbc4fc21ae517fe7c388ad /apps/app_osplookup.c | |
parent | f2b836ff4f9f34c48f36b9aca18c633834dc0ace (diff) |
everything that loads a config that needs a config file to run
now reports AST_MODULE_LOAD_DECLINE when loading if config file
is not there, also fixed an error in res_config_pgsql where it
had a non static function when it should.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41633 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_osplookup.c')
-rw-r--r-- | apps/app_osplookup.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index c700e81ce..e5fcf9a51 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -1431,10 +1431,11 @@ static int osp_load(void) ast_config_destroy(cfg); } else { ast_log(LOG_WARNING, "OSP: Unable to find configuration. OSP support disabled\n"); + return 0; } ast_log(LOG_DEBUG, "OSP: osp_initialized '%d'\n", osp_initialized); - return 0; + return 1; } static int osp_unload(void) @@ -1606,7 +1607,9 @@ static int load_module(void) { int res; - osp_load(); + if(!osp_load()) + return AST_MODULE_LOAD_DECLINE; + res = ast_cli_register(&osp_cli); res |= ast_register_application(app1, ospauth_exec, synopsis1, descrip1); res |= ast_register_application(app2, osplookup_exec, synopsis2, descrip2); |