summaryrefslogtreecommitdiffstats
path: root/runtime/conf.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-271-1/+4
|\
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-271-1/+4
| |\
| | * increased max config file line size to 64kRainer Gerhards2012-01-241-1/+4
* | | removing the newScope/resumeScope macro interfacesRainer Gerhards2012-01-191-4/+2
* | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-6/+1
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-181-20/+16
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-141-20/+16
| |\|
| | * license changeRainer Gerhards2012-01-141-20/+16
| | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-12-161-1/+1
| | |\
| | | * improved some code based on clang static analyzer resultsRainer Gerhards2010-12-161-1/+1
* | | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-091-0/+5
* | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-1/+1
|\| | |
| * | | bugfix: missing whitespace after property-based filter was not detectedRainer Gerhards2011-10-211-1/+1
* | | | Merge branch 'v5-devel'Rainer Gerhards2010-12-171-1/+6
|\| | |
| * | | bugfix: unitialized variable could cause issues under extreme conditionsRainer Gerhards2010-12-161-1/+6
* | | | milestone: added support for CEE-properties in property-based filtersRainer Gerhards2010-12-011-7/+20
* | | | Merge branch 'master' into newconfRainer Gerhards2010-08-051-1/+1
|\| | |
| * | | Merge branch 'v4-devel' into masterRainer Gerhards2010-08-051-1/+1
| |\| |
| | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-08-051-1/+1
| | |\|
| | | * program name filter ! in the configuration cannot be resetKiss Gabor (Bitman)2010-08-051-2/+1
* | | | final (?) milestone: looks like action scoping works nowRainer Gerhards2010-07-271-1/+34
* | | | added support to save/restore rsyslog core action settings...Rainer Gerhards2010-07-231-1/+19
* | | | first shot at scoping (for actions only)Rainer Gerhards2010-07-231-1/+93
|/ / /
* | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-041-3/+5
|\| |
| * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2010-02-041-3/+5
| |\ \
| | * | bugfix: several smaller bugs resolved after flexelint reviewvarmojfekoj2010-02-041-3/+5
* | | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-261-1/+2
|\| | |
| * | | bugfix: blanks inside file names did not terminate file name parsing.Rainer Gerhards2010-01-191-1/+2
* | | | bugfix: first UDP listener was incorrectly assigned its rulesetRainer Gerhards2009-10-191-1/+2
* | | | cleanup: finally moved some config variables just to conf.cRainer Gerhards2009-10-191-7/+15
* | | | some mild restart-type HUP cleanupRainer Gerhards2009-07-151-17/+1
* | | | Merge branch 'master' into v5-develRainer Gerhards2009-06-261-1/+9
|\| | |
| * | | optimization: propert names are now internally identified by integersRainer Gerhards2009-06-261-1/+9
* | | | Merge branch 'omfile' into tmpRainer Gerhards2009-06-221-1/+1
|\| | |
| * | | Merge branch 'master' into newmsgRainer Gerhards2009-06-181-1/+1
| |\| |
| | * | Merge branch 'beta'Rainer Gerhards2009-06-181-1/+1
| | |\ \
| | | * | Merge branch 'v3-stable' into betaRainer Gerhards2009-06-181-1/+1
| | | |\|
| | | | * some minor bugfixesRainer Gerhards2009-06-181-1/+1
* | | | | Merge branch 'omfile' into v5-develRainer Gerhards2009-06-161-72/+85
|\| | | |
| * | | | Merge branch 'master' into omfileRainer Gerhards2009-06-161-22/+18
| |\| | |
| | * | | done various optimizations to the stringbuf and its usersRainer Gerhards2009-06-161-22/+18
| * | | | completed multi-ruleset core supportRainer Gerhards2009-06-121-1/+1
| * | | | fixed abort when emergency configuration was activatedRainer Gerhards2009-06-121-1/+0
| * | | | improved config error messagesRainer Gerhards2009-06-121-4/+12
| * | | | added $Ruleset config commandRainer Gerhards2009-06-101-3/+3
| * | | | restructered code in perparation for multiple rule set supportRainer Gerhards2009-06-101-46/+56
| |/ / /
* | | | Merge branch 'master' into v5-develRainer Gerhards2009-06-041-1/+1
|\| | |
| * | | Merge branch 'beta'Rainer Gerhards2009-05-291-1/+1
| |\| |
| | * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-291-1/+1
| | |\|
| | | * fixed a regression of yesterday's patchRainer Gerhards2009-05-291-1/+1