diff options
| author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-31 21:00:20 +0000 |
|---|---|---|
| committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-31 21:00:20 +0000 |
| commit | 73925ee14a02afb50f6c0aea3cc4e54f99493440 (patch) | |
| tree | 5eac7fd790352b502dbbc4fc21ae517fe7c388ad /apps/app_osplookup.c | |
| parent | 43c75db33e757e08cdec37b1713a0e275d9a039b (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: http://svn.digium.com/svn/asterisk/trunk@41633 f38db490-d61c-443f-a65b-d21fe96a405b
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); |