From 538d0061c5dd88d24e543835a30418ecf99e5802 Mon Sep 17 00:00:00 2001
From: yaworsky <yaworsky>
Date: Wed, 7 Dec 2005 03:33:43 +0000
Subject: Added --conf option.

---
 daemon/conf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'daemon/conf.c')

diff --git a/daemon/conf.c b/daemon/conf.c
index 9be1c18..a80a689 100644
--- a/daemon/conf.c
+++ b/daemon/conf.c
@@ -948,7 +948,9 @@ gboolean read_configuration()
 
     TRACE_ENTER( "\n" );
 
-    if( '\\' == syslog_conf_dir[0] || '/' == syslog_conf_dir[0] || ':' == syslog_conf_dir[1] )
+    if( conf_file_name )
+        pathname = g_strdup( conf_file_name );
+    else if( '\\' == syslog_conf_dir[0] || '/' == syslog_conf_dir[0] || ':' == syslog_conf_dir[1] )
         /* absolute path */
         pathname = g_build_filename( syslog_conf_dir, "syslog.conf", NULL );
     else
-- 
cgit v1.2.3