summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--plugins/immark/immark.c2
-rw-r--r--tools/rsyslogd.84
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 32594af7..47726ae3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -168,6 +168,11 @@ Version 3.18.1 (rgerhards), 2008-07-??
is just a simple addition of faciltity and severity). I have changed
this to use own, consistent, code for PRI calculation. [Backport from
3.19.10]
+- bugfix: mark messages were not correctly written to text log files
+ the markmessageinterval was not correctly propagated to all places
+ where it was needed. This resulted in rsyslog using the default
+ (20 minutes) in some code pathes, what looked to the user like mark
+ messages were never written.
---------------------------------------------------------------------------
Version 3.18.0 (rgerhards), 2008-07-11
- begun a new v3-stable based on former 3.17.4 beta plus patches to
diff --git a/plugins/immark/immark.c b/plugins/immark/immark.c
index 0baff1de..bdca4d58 100644
--- a/plugins/immark/immark.c
+++ b/plugins/immark/immark.c
@@ -85,6 +85,8 @@ ENDrunInput
BEGINwillRun
CODESTARTwillRun
+ /* We set the global MarkInterval to what is configured here -- rgerhards, 2008-07-15 */
+ MarkInterval = iMarkMessagePeriod;
if(iMarkMessagePeriod == 0)
iRet = RS_RET_NO_RUN;
ENDwillRun
diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8
index 2aa911d9..a1395d73 100644
--- a/tools/rsyslogd.8
+++ b/tools/rsyslogd.8
@@ -266,7 +266,7 @@ Disabling inet domain sockets will limit risk to the local machine.
If remote logging is enabled, messages can easily be spoofed and replayed.
As the messages are transmitted in clear-text, an attacker might use
the information obtained from the packets for malicious things. Also, an
-attacker might reply recorded messages or spoof a sender's IP address,
+attacker might replay recorded messages or spoof a sender's IP address,
which could lead to a wrong perception of system activity. These can
be prevented by using GSS-API authentication and encryption. Be sure
to think about syslog network security before enabling it.
@@ -310,7 +310,7 @@ following options possible (all are case insensitive):
.IP LogFuncFlow
Print out the logical flow of functions (entering and exiting them)
.IP FileTrace
-Ppecifies which files to trace LogFuncFlow. If not set (the
+Specifies which files to trace LogFuncFlow. If not set (the
default), a LogFuncFlow trace is provided for all files. Set to
limit it to the files specified.FileTrace may be specified multiple
times, one file each (e.g. export RSYSLOG_DEBUG="LogFuncFlow