summaryrefslogtreecommitdiffstats
path: root/grammar
Commit message (Collapse)AuthorAgeFilesLines
* add RainerScript re_extract() functionRainer Gerhards2013-03-272-2/+104
|
* Fix for glob(3)s that lack GLOB_NOMAGICMartin Carpenter2013-03-211-4/+8
| | | | | | Conflicts: configure.ac
* Merge branch 'v7-stable' into tmpRainer Gerhards2013-03-201-1/+5
|\
| * bugfix: RainerScript getenv() function caused segfault when var was not foundPhilippe Muller2013-03-201-1/+5
| | | | | | | | | | | | | | This patch is released under ASL 2.0 as of email conversation from 2013-03-20. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | bugfix: segfault in expression optimizerRainer Gerhards2013-03-151-4/+4
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=423
* | Merge branch 'v7-stable'Rainer Gerhards2013-03-132-3/+14
|\| | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * bugfix: include files got included in the wrong orderRainer Gerhards2013-02-282-3/+14
| | | | | | | | | | | | | | | | | | This happens if an $IncludeConfig directive was done on multiple files (e.g. the distro default of $IncludeConfig /etc/rsyslog.d/*.conf). In that case, the order of include file processing is reversed, which could lead to all sorts of problems. Thanks to Nathan Stratton Treadway for his great analysis of the problem, which made bug fixing really easy.
* | field() function now supports a string as field delimiterRainer Gerhards2013-02-101-7/+58
| | | | | | | | | | also done a bugfix: field() function did never return "***FIELD NOT FOUND***" instead it returned "***ERROR in field() FUNCTION***" in that case
* | bugfix: script == comparison did not work properly on JSON objectsRainer Gerhards2013-02-081-0/+23
| |
* | optimize: use binary search on EQ/NEQ array matchesRainer Gerhards2013-01-271-20/+46
| | | | | | | | | | | | Conflicts: grammar/rainerscript.c
* | Merge branch 'v7-stable'Rainer Gerhards2013-01-091-8/+17
|\|
| * bugfix: some property-based filter were incorrectly parsedRainer Gerhards2013-01-091-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | This usually lead to a syntax error on startup and rsyslogd not actually starting up. The problem was the regex, which did not care for double quote characters to follow in the action part - unfortunately something that can frequently happen with v6+ format. An example: :programname, isequal, "as" {action(type="omfile" ...) } Here, the part :programname, isequal, "as" {action(type="omfile" was treated as the property filter, and the rest as action part. Obviously, this did not work out. Unfortunately, such situations usually resulted in very hard to understand error messages.
| * improve config reader error messages a bit moreRainer Gerhards2013-01-091-6/+12
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-01-091-1/+2
|\| | | | | | | | | Conflicts: ChangeLog
| * slightly improved config parser error messages when invalid escapes happenRainer Gerhards2013-01-091-1/+2
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-01-081-5/+5
|\|
| * bugfix: doGetFileCreateMode() had invalid validity check ;)Chandler Latour2013-01-081-5/+5
| |
* | Merge branch 'v7-stable'Rainer Gerhards2012-12-181-0/+4
|\|
| * cosmetic: silence compiler warningRainer Gerhards2012-12-181-0/+4
| |
* | Merge branch 'master-optimize-facilitext'Rainer Gerhards2012-12-141-14/+354
|\ \
| * | script optimizer: support textual severities in compare operations as wellRainer Gerhards2012-12-111-0/+17
| | |
| * | script optimizer: support numerical facilities in compare operations as wellRainer Gerhards2012-12-111-5/+58
| | |
| * | script optimizer: severity lt/le/gt/ge to prifilt()Rainer Gerhards2012-12-111-16/+46
| | |
| * | script optimizer: severity eq/ne to prifilt()Rainer Gerhards2012-12-111-5/+37
| | |
| * | bugfix: optimizer stopped prematurely on some operationsRainer Gerhards2012-12-111-0/+11
| | |
| * | script optimizer: optimize and/or on PRI filtersRainer Gerhards2012-12-111-0/+37
| | |
| * | script optimizer: support NOT pri matchesRainer Gerhards2012-12-111-4/+42
| | |
| * | enhance optimizer: detect eq-comparison for syslog facilityRainer Gerhards2012-12-111-9/+131
| | | | | | | | | | | | ... and replace it with a (much faster) prifilt() call
* | | Merge branch 'v7-stable-newmsglock' into master-newmsglockRainer Gerhards2012-12-062-0/+25
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: runtime/msg.c runtime/queue.c tools/syslogd.c
| * fix missing functionality: ruleset(){} could not specify ruleset queueRainer Gerhards2012-11-302-0/+25
| | | | | | | | | | | | | | | | | | | | The "queue.xxx" parameter set was not supported, and legacy ruleset config statements did not work (by intention). The fix introduces the "queue.xxx" parameter set. It has some regression potential, but only for the new functionality. Note that using that interface it is possible to specify duplicate queue file names, which will cause trouble. This will be solved in v7.3, because there is a too-large regression potential for the v7.2 stable branch.
* | cleanupRainer Gerhards2012-11-301-1/+0
| |
* | Merge branch 'v7-stable'Rainer Gerhards2012-11-281-2/+4
|\| | | | | | | | | | | | | Conflicts: doc/imptcp.html plugins/mmjsonparse/mmjsonparse.c plugins/mmnormalize/mmnormalize.c
| * silence some primarily cosmetic compiler warning messagesRainer Gerhards2012-11-281-2/+4
| |
* | Merge branch 'v7-stable'Rainer Gerhards2012-11-222-7/+12
|\| | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/bsd.c plugins/imklog/imklog.c plugins/imklog/imklog.h
| * improve $IncludeConfig error messagesRainer Gerhards2012-11-201-4/+7
| |
| * regression fix: rsyslog terminated when wild-card $includeFile did not find ↵Rainer Gerhards2012-11-201-2/+5
| | | | | | | | | | | | files Unfortunately, this is often the case by default in many distros.
| * cleanupRainer Gerhards2012-11-201-1/+0
| |
* | Merge branch 'v7-stable'Rainer Gerhards2012-11-141-5/+17
|\|
| * make sure inaccessible config file is not tried to be processedRainer Gerhards2012-11-141-3/+3
| | | | | | | | | | | | | | The processing loop was not terminated when an unaccessible file was detected, and so processing was done using unitialized data, which could lead to all sorts of problems. Also did some minor cleanup.
| * Silently ignore wildcard includes that match nothingGeorgi Georgiev2012-11-131-4/+16
| | | | | | | | This will avoid an error message when including an empty directory.
* | Merge branch 'v7-stable'Rainer Gerhards2012-11-091-17/+19
|\|
| * Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-091-16/+18
| |\ | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * bugfix: $IncludeConfig did not correctly process directoriesRainer Gerhards2012-11-091-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=376 The testbench was also enhanced to check for these cases. Thanks to Georgi Georgiev for the bug report. Also minor bugfix: no error msg on unreadable $IncludeConfig path
| | * Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-041-0/+1
| | |\
| * | \ Merge branch 'v7.2.1-bugfix' into v7-stableRainer Gerhards2012-11-091-1/+1
| |\ \ \
| | * | | bugfix: potential segfault due to invalid param handling in comparisonsRainer Gerhards2012-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen in RainerScript comparisons (like contains); in some cases an unitialized variable was accessed, which could lead to an invalid free and in turn to a segfault. Closes: http://bugzilla.adiscon.com/show_bug.cgi?id=372 Thanks to Georgi Georgiev for reporting this bug and his great help in solving it.
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-021-1/+0
|\| | | |
| * | | | bugfix: potential segfault when re_match() function was usedoxpa2012-11-021-1/+0
| |/ / / | | | | | | | | | | | | | | | | Thanks to oxpa for the patch. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=371
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-291-1/+1
|\| | |
| * | | bugfix: ruleset()-object did only support a single statementRainer Gerhards2012-10-271-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 18:14:32 +0000