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 /cdr/cdr_manager.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 'cdr/cdr_manager.c')
| -rw-r--r-- | cdr/cdr_manager.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c index 07406734d..4e43a30ff 100644 --- a/cdr/cdr_manager.c +++ b/cdr/cdr_manager.c @@ -49,7 +49,7 @@ static char *name = "cdr_manager"; static int enablecdr = 0; -static void loadconfigurationfile(void) +static int loadconfigurationfile(void) { char *cat; struct ast_config *cfg; @@ -59,7 +59,7 @@ static void loadconfigurationfile(void) if (!cfg) { /* Standard configuration */ enablecdr = 0; - return; + return 0; } cat = ast_category_browse(cfg, NULL); @@ -80,6 +80,7 @@ static void loadconfigurationfile(void) } ast_config_destroy(cfg); + return 1; } static int manager_log(struct ast_cdr *cdr) @@ -145,7 +146,8 @@ static int load_module(void) int res; /* Configuration file */ - loadconfigurationfile(); + if(loadconfigurationfile()) + return AST_MODULE_LOAD_DECLINE; res = ast_cdr_register(name, "Asterisk Manager Interface CDR Backend", manager_log); if (res) { |