aboutsummaryrefslogtreecommitdiffstats
path: root/daemon/conf.c
diff options
context:
space:
mode:
authoryaworsky <yaworsky>2005-12-07 03:33:43 +0000
committeryaworsky <yaworsky>2005-12-07 03:33:43 +0000
commit538d0061c5dd88d24e543835a30418ecf99e5802 (patch)
tree2195d7b66c2d17487472b9c1950d1999466102a8 /daemon/conf.c
parente459f29dff80f46b7a725e77bb82d9f4df186868 (diff)
downloadsyslog-win32-538d0061c5dd88d24e543835a30418ecf99e5802.tar.gz
syslog-win32-538d0061c5dd88d24e543835a30418ecf99e5802.tar.xz
syslog-win32-538d0061c5dd88d24e543835a30418ecf99e5802.zip
Added --conf option.
Diffstat (limited to '')
-rw-r--r--daemon/conf.c4
1 files changed, 3 insertions, 1 deletions
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