automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@9237 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 11 insertions, 2 deletions

diff --git a/logger.c b/logger.c
index 06fcf9a80..a6e07d6f8 100644
--- 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"))) {