diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 12:53:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 12:53:12 +0200 |
| commit | 2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7 (patch) | |
| tree | ba1953678dcacb485e76f6df408b87e0c7e929b1 | |
| parent | c34ef852ee583de6e335f02d78f917b7d4da8062 (diff) | |
| parent | 2f8fb81bd4cfcc69049b767139389af023d1eef6 (diff) | |
| download | rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.tar.gz rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.tar.xz rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/status.html
rsyslog.conf.5
syslogd.c
| -rw-r--r-- | ChangeLog | 37 | ||||
| -rw-r--r-- | doc/status.html | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | liblogging-stub.h | 0 | ||||
| -rw-r--r-- | rfc3195d.8 | 2 | ||||
| -rw-r--r-- | rsyslog.conf.5 | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | srUtils.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | srUtils.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | stringbuf.c | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | stringbuf.h | 0 | ||||
| -rw-r--r-- | syslogd.c | 5 |
10 files changed, 35 insertions, 15 deletions
@@ -12,13 +12,6 @@ Version 3.15.1 (rgerhards), 2008-04-?? happens during startup) - bugfix: memory leaks in script engine - bugfix: $hostname and $fromhost in RainerScript did not work -- We have removed the 32 character size limit (from RFC3164) on the - tag. This had bad effects on existing envrionments, as sysklogd didn't - obey it either (probably another bug in RFC3164...). We now receive - the full size, but will modify the outputs so that only 32 characters - max are used by default. If you need large tags in the output, you need - to provide custom templates. -- bugfix: some memory leak when queue is runing in disk mode --------------------------------------------------------------------------- Version 3.15.0 (rgerhards), 2008-04-01 - major new feature: imrelp/omrelp support reliable delivery of syslog @@ -30,6 +23,36 @@ Version 3.15.0 (rgerhards), 2008-04-01 only installed if corresponding option is selected. Thanks to Michael Biebl for pointing these problems out. --------------------------------------------------------------------------- +Version 3.14.2 (rgerhards), 2008-04-?? +- bugfix: segfault with expression-based filters +- some cleanup +--------------------------------------------------------------------------- +Version 3.14.1 (rgerhards), 2008-04-04 +- bugfix: some messages were emited without hostname +- bugfix: rsyslogd was no longer build by default; man pages are + only installed if corresponding option is selected. Thanks to + Michael Biebl for pointing these problems out. +- bugfix: zero-length strings were not supported in object + deserializer +- disabled atomic operations for this stable build as it caused + platform problems +- bugfix: memory leaks in script engine +- bugfix: $hostname and $fromhost in RainerScript did not work +- bugfix: some memory leak when queue is runing in disk mode +- man pages improved thanks to varmofekoj and Peter Vrabec +- We have removed the 32 character size limit (from RFC3164) on the + tag. This had bad effects on existing envrionments, as sysklogd didn't + obey it either (probably another bug in RFC3164...). We now receive + the full size, but will modify the outputs so that only 32 characters + max are used by default. If you need large tags in the output, you need + to provide custom templates. +- bugfix: some memory leak when queue is runing in disk mode +--------------------------------------------------------------------------- +Version 3.14.0 (rgerhards), 2008-04-02 +An interim version was accidently released to the web. It was named 3.14.0. +To avoid confusion, we have not assigned this version number to any +official release. If you happen to use 3.14.0, please update to 3.14.1. +--------------------------------------------------------------------------- Version 3.13.0-dev0 (rgerhards), 2008-03-31 - bugfix: accidently set debug option in 3.12.5 reset to production This option prevented dlclose() to be called. It had no real bad effects, diff --git a/doc/status.html b/doc/status.html index b9bfd5c6..d7111a50 100644 --- a/doc/status.html +++ b/doc/status.html @@ -2,7 +2,7 @@ <html><head><title>rsyslog status page</title></head> <body> <h2>rsyslog status page</h2> -<p>This page reflects the status as of 2008-04-01.</p> +<p>This page reflects the status as of 2008-04-04.</p> <h2>Current Releases</h2> <p><b>development:</b> 3.15.0 - @@ -30,7 +30,7 @@ help port rsyslog to other platforms. As such, platform list is now maintained inside the rsyslog wiki</a>. Platform maintainers perhaps have posted extra information there. If you do platform-specific work, feel free to add information to the wiki.</p> -<p>Rsyslog is the default syslogd in Fedora 8.</p> +<p>Rsyslog is the default syslogd in Fedora 8 and above.</p> <h2>Additional information</h2> <p><b>Currently supported features are listed on the <a href="features.html">rsyslog features page</a>.</b></p> <ul> diff --git a/liblogging-stub.h b/liblogging-stub.h index 03315f08..03315f08 100755..100644 --- a/liblogging-stub.h +++ b/liblogging-stub.h @@ -1,7 +1,7 @@ .\" Copyright 2005 Rainer Gerhards and Adiscon for the rsyslog modifications .\" Distributed under the GNU General Public License. .\" -.TH RSYSLOGD 8 "03 July 2007" "Version 1.14.2 (devel)" "Linux System Administration" +.TH RFC3195D 8 "02 April 2008" "Version 3.14.0" "Linux System Administration" .SH NAME rfc3195d \- RFC 3195 listener .SH SYNOPSIS diff --git a/rsyslog.conf.5 b/rsyslog.conf.5 index e15a4549..4fa98ef2 100644 --- a/rsyslog.conf.5 +++ b/rsyslog.conf.5 @@ -17,7 +17,7 @@ .\" along with this program; if not, write to the Free Software .\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. .\" -.TH RSYSLOG.CONF 5 "04 April 2008" "Version 3.15.0" "Linux System Administration" +.TH RSYSLOG.CONF 5 "07 April 2008" "Version 3.15.1" "Linux System Administration" .SH NAME rsyslog.conf \- rsyslogd(8) configuration file .SH DESCRIPTION diff --git a/srUtils.c b/srUtils.c index fa451b7e..fa451b7e 100755..100644 --- a/srUtils.c +++ b/srUtils.c diff --git a/srUtils.h b/srUtils.h index ebd6518f..ebd6518f 100755..100644 --- a/srUtils.h +++ b/srUtils.h diff --git a/stringbuf.c b/stringbuf.c index 4254d5bd..4254d5bd 100755..100644 --- a/stringbuf.c +++ b/stringbuf.c diff --git a/stringbuf.h b/stringbuf.h index aa31884e..aa31884e 100755..100644 --- a/stringbuf.h +++ b/stringbuf.h @@ -2930,6 +2930,7 @@ GlobalClassExit(void) objRelease(conf, CORE_COMPONENT); objRelease(expr, CORE_COMPONENT); objRelease(vm, CORE_COMPONENT); + objRelease(var, CORE_COMPONENT); objRelease(datetime, CORE_COMPONENT); /* TODO: implement the rest of the deinit */ @@ -2955,10 +2956,7 @@ GlobalClassExit(void) CHKiRet(templateInit()); #endif /* dummy "classes */ -dbgprintf("pre strExit()\n"); strExit(); -dbgprintf("post strExit()\n"); - #if 0 CHKiRet(objGetObjInterface(&obj)); /* this provides the root pointer for all other queries */ @@ -3033,7 +3031,6 @@ int realMain(int argc, char **argv) if (isupper((int) *p)) *p = (char)tolower((int)*p); - CHKiRet_Hdlr(InitGlobalClasses()) { fprintf(stderr, "rsyslogd initializiation failed - global classes could not be initialized.\n" "Did you do a \"make install\"?\n" |