automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@9237 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/cdr/Makefile b/cdr/Makefile
index 49c3e4f4d95ff2e329ea49cd1c3ce491be6b9b6b..3cd83f492085fcd9b8ec1f445ebeaf610808ba39 100644 (file)
--- 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 913c46c4eb4a9901a3877adfdeb93dca603e9c43..70b70333e8655b365ed159cfdf090a7dd8b6c3e1 100644 (file)
--- 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);

diff --git a/logger.c b/logger.c
index 06fcf9a8002b8893c317f630ec87ef11ebabb460..a6e07d6f84ac4ed88496f7d1b8d2b1c03fce1da9 100644 (file)
--- a/logger.c
+++ b/logger.c
@@ -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"))) {