diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-08 23:00:44 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-08 23:00:44 +0000 |
| commit | 271f830e85082b553d0c458cfd0d0b0f6d72fa1b (patch) | |
| tree | 7ed4679bc47fb39996c24064f9f913a5a7b1a500 | |
| parent | 779b9ce80d27a0991af1584fc76d7e1215b28e7f (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@9237 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | cdr/Makefile | 6 | ||||
| -rw-r--r-- | channels/chan_oss.c | 3 | ||||
| -rw-r--r-- | logger.c | 13 |
3 files changed, 17 insertions, 5 deletions
diff --git a/cdr/Makefile b/cdr/Makefile index 49c3e4f4d..3cd83f492 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -45,11 +45,11 @@ endif # # FreeTDS stuff... # -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),) - ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1) +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),) + ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) CFLAGS += -DFREETDS_0_63 else - ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.62),1) + ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1) CFLAGS += -DFREETDS_0_62 else CFLAGS += -DFREETDS_PRE_0_62 diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 913c46c4e..70b70333e 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -1376,6 +1376,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); @@ -309,9 +309,18 @@ static void init_logger_chain(void) cfg = ast_config_load("logger.conf"); - /* If no config file, we're fine */ - if (!cfg) + /* If no config file, we're fine, set default options. */ + if (!cfg) { + fprintf(stderr, "Unable to open logger.conf: %s\n", strerror(errno)); + chan = malloc(sizeof(struct logchannel)); + memset(chan, 0, sizeof(struct logchannel)); + chan->type = LOGTYPE_CONSOLE; + chan->logmask = 28; /*warning,notice,error */ + chan->next = logchannels; + logchannels = chan; + global_logmask |= chan->logmask; return; + } ast_mutex_lock(&loglock); if ((s = ast_variable_retrieve(cfg, "general", "appendhostname"))) { |