From 4b613a4294e373301f3d8a3177d0ff993387f98d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 29 Jul 2008 15:28:25 +0200 Subject: fixed some minor nits in preperation for 3.21.1 --- ChangeLog | 5 +++-- Makefile.am | 8 +++++--- configure.ac | 4 ++-- doc/manual.html | 2 +- doc/status.html | 12 ++++++------ tests/Makefile.am | 14 +++++++++++++- tools/rsyslogd.8 | 17 ++++++++++++++++- 7 files changed, 46 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 777a18a5..587fa113 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ --------------------------------------------------------------------------- -Version 3.21.1 [DEVEL] (rgerhards), 2008-07-28 +Version 3.21.1 [DEVEL] (rgerhards), 2008-07-29 - bugfix: no error was reported if the target of a $IncludeConfig could not be accessed. - added testbed for common config errors +- added doc for -u option to rsyslogd man page - enhanced config file checking - no active actions are detected - added -N rsyslogd command line option for a config validation run (which does not execute actual syslogd code and does not interfere @@ -11,7 +12,7 @@ Version 3.21.1 [DEVEL] (rgerhards), 2008-07-28 if the config contains no active actions - rsyslogd error messages are now reported to stderr by default. can be turned off by the new "$ErrorMessagesToStderr off" directive - Thanks to HKS for suggesting these new features. + Thanks to HKS for suggesting the new features. --------------------------------------------------------------------------- Version 3.21.0 [DEVEL] (rgerhards), 2008-07-18 - starts a new devel branch diff --git a/Makefile.am b/Makefile.am index 47453443..a3a6e19b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,9 +50,7 @@ EXTRA_DIST = \ contrib/gnutls/cert.pem \ contrib/gnutls/key.pem -SUBDIRS = doc runtime . tests - -SUBDIRS += plugins/immark plugins/imuxsock plugins/imtcp plugins/imudp plugins/omtesting +SUBDIRS = doc runtime . plugins/immark plugins/imuxsock plugins/imtcp plugins/imudp plugins/omtesting if ENABLE_RSYSLOGD SUBDIRS += tools @@ -105,3 +103,7 @@ endif if ENABLE_RFC3195 SUBDIRS += plugins/im3195 endif + +# tests are added as last element, because tests may need different +# modules that need to be generated first +SUBDIRS += tests diff --git a/configure.ac b/configure.ac index 62dd37a1..c28cc139 100644 --- a/configure.ac +++ b/configure.ac @@ -658,7 +658,6 @@ AM_CONDITIONAL(ENABLE_IMTEMPLATE, test x$enable_imtemplate = xyes) AC_CONFIG_FILES([Makefile \ runtime/Makefile \ tools/Makefile \ - tests/Makefile \ doc/Makefile \ plugins/imudp/Makefile \ plugins/imtcp/Makefile \ @@ -678,7 +677,8 @@ AC_CONFIG_FILES([Makefile \ plugins/omrelp/Makefile \ plugins/omlibdbi/Makefile \ plugins/ommail/Makefile \ - plugins/omsnmp/Makefile]) + plugins/omsnmp/Makefile \ + tests/Makefile]) AC_OUTPUT echo "****************************************************" diff --git a/doc/manual.html b/doc/manual.html index fe97ef84..a41c44e0 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -16,7 +16,7 @@ relay chains while at the same time being very easy to setup for the novice user. And as we know what enterprise users really need, there is also professional rsyslog support available directly from the source!

-

This documentation is for version 3.21.0 (devel branch) of rsyslog. +

This documentation is for version 3.21.1 (devel branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might diff --git a/doc/status.html b/doc/status.html index be012524..c9c33adf 100644 --- a/doc/status.html +++ b/doc/status.html @@ -2,19 +2,19 @@ rsyslog status page

rsyslog status page

-

This page reflects the status as of 2008-07-18.

+

This page reflects the status as of 2008-07-29.

Current Releases

-

development: 3.21.0 [2008-07-18] - -change log - -download +

development: 3.21.1 [2008-07-29] - +change log - +download
beta: 3.19.10 [2008-07-15] - change log - download

-

v3 stable: 3.18.0 [2008-07-11] - change log - -download +

v3 stable: 3.18.1 [2008-07-21] - change log - +download
v2 stable: 2.0.5 [2008-05-15] - change log - download diff --git a/tests/Makefile.am b/tests/Makefile.am index 87e50c79..409a6650 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,19 @@ check_PROGRAMS = rt_init rscript TESTS = $(check_PROGRAMS) cfg.sh test_files = testbench.h runtime-dummy.c -EXTRA_DIST=1.rstest 2.rstest err1.rstest +EXTRA_DIST=1.rstest 2.rstest err1.rstest \ + cfg.sh \ + cfg1.cfgtest \ + cfg1.testin \ + cfg2.cfgtest \ + cfg2.testin \ + cfg3.cfgtest \ + cfg3.testin \ + cfg4.cfgtest \ + cfg4.testin \ + DevNull.cfgtest \ + err1.rstest \ + NoExistFile.cfgtest rt_init_SOURCES = rt-init.c $(test_files) rt_init_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(rsrt_cflags) diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8 index 947102de..05905412 100644 --- a/tools/rsyslogd.8 +++ b/tools/rsyslogd.8 @@ -1,7 +1,7 @@ .\" Copyright 2004-2008 Rainer Gerhards and Adiscon for the rsyslog modifications .\" May be distributed under the GNU General Public License .\" -.TH RSYSLOGD 8 "11 July 2008" "Version 3.18.0" "Linux System Administration" +.TH RSYSLOGD 8 "29 July 2008" "Version 3.21.1" "Linux System Administration" .SH NAME rsyslogd \- reliable and extended syslogd .SH SYNOPSIS @@ -30,6 +30,9 @@ rsyslogd \- reliable and extended syslogd .RB [ " \-s " .I domainlist ] +.RB [ " \-u " +.I userlevel +] .RB [ " \-v " ] .RB [ " \-w " ] .RB [ " \-x " ] @@ -202,6 +205,18 @@ is specified and the host logging resolves to satu.infodrom.north.de no domain would be cut, you will have to specify two domains like: .BR "\-s north.de:infodrom.north.de" . .TP +.BI "\-u " "userlevel" +This is a "catch all" option for some very seldomly-used user settings. +The "userlevel" variable selects multiple things. Add the specific values +to get the combined effect of them. +A value of 1 prevents rsyslogd from parsing hostnames and tags inside +messages. +A value of 2 prevents rsyslogd from changing to the root directory. This +is almost never a good idea in production use. This option was introduced +in support of the internal testbed. +To combine these two features, use a userlevel of 3 (1+2). Whenever you use +an -u option, make sure you really understand what you do and why you do it. +.TP .B "\-v" Print version and exit. .TP -- cgit