summaryrefslogtreecommitdiff
path: root/channels/chan_oss.c
diff options
context:
space:
mode:
authorMatt O'Gorman <mogorman@digium.com>2006-02-08 23:14:17 +0000
committerMatt O'Gorman <mogorman@digium.com>2006-02-08 23:14:17 +0000
commit5f0de64f780aeea5117239265f09f33bbfde5bfa (patch)
tree249311b44c8925e58502063381858cbdab987827 /channels/chan_oss.c
parent8774e4a7d88906836b7f89579b20c87fb9aed81a (diff)
Merged revisions 9232 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2 ........ r9232 | mogorman | 2006-02-08 16:12:34 -0600 (Wed, 08 Feb 2006) | 4 lines Make logger report error,warning,notice if logger.conf not found, also updated chan_oss to give correct error message if its config file is not found. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9239 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_oss.c')
-rw-r--r--channels/chan_oss.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 858411de7..10c9767a6 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -1392,6 +1392,9 @@ int load_module(void)
store_config(cfg, ctg);
} while ( (ctg = ast_category_browse(cfg, ctg)) != NULL);
ast_config_destroy(cfg);
+ } else {
+ ast_log(LOG_NOTICE, "Unable to load config oss.conf\n");
+ return -1;
}
if (find_desc(oss_active) == NULL) {
ast_log(LOG_NOTICE, "Device %s not found\n", oss_active);