rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-22 06:00:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta'

Browse Source 
Conflicts:
	ChangeLog
	doc/v6compatibility.html
This commit is contained in:
Rainer Gerhards 2012-01-09 14:21:35 +01:00
commit 7dfc7c709f
6 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -9,6 +9,8 @@ Version 6.3.7 [DEVEL] 2011-0?-??
- bugfix: potential abort after reading invalid X.509 certificate
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290
Thanks to Tomas Heinrich for the patch
- bugfix (kind of): removed numerical part from pri-text
see v6 compatibility document for reasons
- bugfix: race condition when extracting program name, APPNAME, structured
data and PROCID (RFC5424 fields) could lead to invalid characters e.g.
in dynamic file names or during forwarding (general malfunction of these
@ -104,6 +106,9 @@ Version 6.2.0 [v6-stable], 2011-0?-??
data and PROCID (RFC5424 fields) could lead to invalid characters e.g.
in dynamic file names or during forwarding (general malfunction of these
fields in templates, mostly under heavy load)
- $Begin, $End, $StrictScoping directives have been removed as v6.4 will
provide the same functionality in a far better way. So we do not want
to clutter the code.
---------------------------------------------------------------------------
Version 6.1.12 [BETA], 2011-09-01
- bugfix/security: off-by-two bug in legacy syslog parser, CVE-2011-3200

1
doc/Makefile.am
View File

@ -2,7 +2,6 @@ html_files = \
index.html \
bugs.html \
debug.html \
scoping.html \
features.html \
generic_design.html \
expression.html \

2
doc/rsyslog_conf_actions.html
View File

@ -8,8 +8,6 @@
message. In general, message content is written to a kind of "logfile".
But also other actions might be done, like writing to a database table
or forwarding to another host.<br>
<p>Please be sure to read about <a href="scoping.html">rsyslog config scoping</a>
in combination with this document.
<br>
Templates can be used with all actions. If used, the specified template
is used to generate the message content (instead of the default

39
doc/scoping.html
View File

@ -1,39 +0,0 @@
<html><head>
<title>rsyslog configuration scoping</title></head>
<body>
<h1>rsyslog configuration scoping</h1>
<p>Starting with version 6.1.0, <a href="http://www.rsyslog.com">rsyslog</a> supports
different scopes inside rsyslog.conf.
Earlier versions had only a single, global scope, where each configuration command affected that global
scope.
This resulted in rather complex configurations. Also many users, even the rsyslog authors, were sometimes
not sure what belonged together. So we started an effort to redo the configuration language.
The initial effort, available in 6.1.0, is scoping for actions. Now, an action can be defined
in its own scope and it will always get a fresh environment, not affected by any config
settings outside of that action definition. Similarly, config statements issues within the
scope do not affect the global scope. This is the recommended ways of defining actions.
<p>However, the previous mode is still supported and any valid pre-v6 config is a valid v6 config
as well. For those interested in more strict scoping, the "$StrictScoping on" directive can
be used to force the use of scopes inside rsyslog.conf. If given, actions and action directives
can not be specified outside of action scopes.
<p>Nestings of scope is not permitted. Each $Begin must be matched by a $End. This is currently not
enforced in all cases (end of file), but is considered a syntax error which later versions of rsyslog
will most probably detect.
<p>Note that scoping is in its infancy. Expect changes, and most importantly enhancements. Currently,
scoping is only supported for actions. As a next step, scoping for inputs is planned. Feedback
on the scoping feature is appreciated.
<h2>Scoping Config Statements</h2>
<ul>
<li><b>$StrictScoping</b> [on/<b>off</b>] - enable strict scoping as described above.
<li><b>$Begin</b> &lt;object&gt; - Begin definitions for the specified object. Inside the scope
only object-specific directives can be given. Currently, only the object type "action" is supported
(note that the object name is case-insensitive).
<li><b>$End</b> &lt;object&gt; - End definitions for the object. Global scope is restored.
</ul>
<p>[<a href="manual.html">manual index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>
<p><font size="2">This documentation is part of the <a href="http://www.rsyslog.com/">rsyslog</a>
project.<br>
Copyright &copy; 2010 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and
<a href="http://www.adiscon.com/">Adiscon</a>.
Released under the GNU GPL version 3 or higher.</font></p>
</body></html>

3
doc/v6compatibility.html
View File

@ -42,7 +42,8 @@ much coding. However, if the new config language shall be supported, more
changes must be made to plugin code. All project-supported plugins have been
upgraded, so this compatibility issue is only of interest for you if you have
custom plugins or use some user-contributed plugins from the rsyslog project
that are not maintained by the project itself (omoracle is an example).
that are not maintained by the project itself (omoracle is an example). Please
expect some further plugin instablity during the initial v6 releases.
<h2>RainerScript based rsyslog.conf</h2>
<p>A better config format was the main release target for rsyslog v6. It comes in the
flavor of so-called RainerScript

5
runtime/conf.c
View File

@ -981,9 +981,14 @@ BEGINAbstractObjClassInit(conf, 1, OBJ_IS_CORE_MODULE) /* class, version - CHANG
CHKiRet(objUse(rule, CORE_COMPONENT));
CHKiRet(objUse(ruleset, CORE_COMPONENT));
/* These commands will NOT be supported -- the new v6.3 config system provides
* far better methods. We will remove the related code soon. -- rgerhards, 2012-01-09
*/
#if 0
CHKiRet(regCfSysLineHdlr((uchar *)"begin", 0, eCmdHdlrGetWord, beginConfObj, NULL, NULL, eConfObjGlobal));
CHKiRet(regCfSysLineHdlr((uchar *)"end", 0, eCmdHdlrGetWord, endConfObj, NULL, NULL, eConfObjAlways));
CHKiRet(regCfSysLineHdlr((uchar *)"strictscoping", 0, eCmdHdlrBinary, NULL, &bConfStrictScoping, NULL, eConfObjGlobal));
#endif
CHKiRet(regCfSysLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, NULL, eConfObjAction));
ENDObjClassInit(conf)