kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 12:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@9237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-08 23:00:44 +00:00
parent f6d4da1706
commit 1c4e84f888
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cdr/Makefile
View File

@@ -45,11 +45,11 @@ endif
# #
# FreeTDS stuff... # FreeTDS stuff...
# #
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),) 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 | grep -c 0.63),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.63),1)
CFLAGS += -DFREETDS_0_63 CFLAGS += -DFREETDS_0_63
else 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 CFLAGS += -DFREETDS_0_62
else else
CFLAGS += -DFREETDS_PRE_0_62 CFLAGS += -DFREETDS_PRE_0_62

3
channels/chan_oss.c
View File

@@ -1376,6 +1376,9 @@ int load_module(void)
store_config(cfg, ctg); store_config(cfg, ctg);
} while ( (ctg = ast_category_browse(cfg, ctg)) != NULL); } while ( (ctg = ast_category_browse(cfg, ctg)) != NULL);
ast_config_destroy(cfg); ast_config_destroy(cfg);
} else {
ast_log(LOG_NOTICE, "Unable to load config oss.conf\n");
return -1;
} }
if (find_desc(oss_active) == NULL) { if (find_desc(oss_active) == NULL) {
ast_log(LOG_NOTICE, "Device %s not found\n", oss_active); ast_log(LOG_NOTICE, "Device %s not found\n", oss_active);

13
logger.c
View File

@@ -309,9 +309,18 @@ static void init_logger_chain(void)
cfg = ast_config_load("logger.conf"); cfg = ast_config_load("logger.conf");
/* If no config file, we're fine */ /* If no config file, we're fine, set default options. */
if (!cfg) 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; return;
}
ast_mutex_lock(&loglock); ast_mutex_lock(&loglock);
if ((s = ast_variable_retrieve(cfg, "general", "appendhostname"))) { if ((s = ast_variable_retrieve(cfg, "general", "appendhostname"))) {