summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2006-01-10 14:40:28 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2006-01-10 14:40:28 +0000
commit707afb5d03e2e594c5e5964e8b3f74adb8cbdf55 (patch)
treeb86e15142de4ce0751a66b5b6082279d24604f85
parentca7fa1f7e97e09788ae091395435dd64ac8532c9 (diff)
downloadrsyslog-707afb5d03e2e594c5e5964e8b3f74adb8cbdf55.tar.gz
rsyslog-707afb5d03e2e594c5e5964e8b3f74adb8cbdf55.tar.xz
rsyslog-707afb5d03e2e594c5e5964e8b3f74adb8cbdf55.zip
fixed a bug that caused the default socket (usually /dev/log) to be opened
even when -o command line option was given
-rw-r--r--NEWS2
-rw-r--r--syslogd.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 947abb4b..bba449d9 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ Version 1.12.2 (RGer), 2005-12-??
- added support for field-extracting in the property replacer
- enhanced the legacy-syslog parser so that it can interpret messages
that do not contain a TIMESTAMP
+- fixed a bug that caused the default socket (usually /dev/log) to be
+ opened even when -o command line option was given
---------------------------------------------------------------------------
Version 1.12.1 (RGer), 2005-11-23
- made multithreading work with BSD. Some signal-handling needed to be
diff --git a/syslogd.c b/syslogd.c
index 9ec41500..6939875c 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -6025,7 +6025,7 @@ static void init()
#ifdef SYSLOG_UNIXAF
- for (i = 0; i < nfunix; i++) {
+ for (i = startIndexUxLocalSockets ; i < nfunix ; i++) {
if (funix[i] != -1)
/* Don't close the socket, preserve it instead
close(funix[i]);