summaryrefslogtreecommitdiffstats
path: root/runtime/conf.c
Commit message (Expand)AuthorAgeFilesLines
* milestone: module() can load module in legacy modeRainer Gerhards2012-06-201-6/+3
* cleanup: remove code for no-longer needed legacy conf functionalityRainer Gerhards2012-02-011-1/+1
* conf file: bufgix: legacy parsing of some filters did not work correctlyRainer Gerhards2012-02-011-1/+1
* bugfix: rsyslog aborted during startup if there is an error in loading an actionRainer Gerhards2012-01-271-5/+1
* Merge branch 'v6-stable'Rainer Gerhards2012-01-271-1/+1
|\
| * 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
* | | | refactor: removing v6.1 scoping codeRainer Gerhards2012-01-191-121/+1
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-01-191-4/+2
|\| | |
| * | | removing the newScope/resumeScope macro interfacesRainer Gerhards2012-01-191-4/+2
* | | | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-6/+1
|\| | |
| * | | 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 'v5-stable' into masterRainer 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
* | | | | Merge branch 'beta'Rainer Gerhards2012-01-091-0/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-091-0/+5
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-1/+1
| |\| | |
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-10-211-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'v5-stable' into v5-develRainer 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 Gerhards2011-09-261-0/+7
|\| | | | |
| * | | | | added capability to emit config error location info for warningsRainer Gerhards2011-08-091-5/+26
* | | | | | milestone: generic action parameters parsed via new config systemRainer Gerhards2011-08-011-1/+2
* | | | | | milestone: queue object now has a param handler for new conf interfaceRainer Gerhards2011-07-221-1/+1
* | | | | | milestone: done plumbing to call plugin create action instance entry pointRainer Gerhards2011-07-201-40/+0
* | | | | | milestone: added module config namesRainer Gerhards2011-07-201-81/+0
* | | | | | Merge branch 'master-newconf'Rainer Gerhards2011-07-121-365/+23
|\ \ \ \ \ \
| * | | | | | more cleanup, working on emergency config systemRainer Gerhards2011-07-111-2/+5
| * | | | | | more cleanupRainer Gerhards2011-07-111-8/+0
| * | | | | | cleanup, removing now unused codeRainer Gerhards2011-07-111-83/+0
| * | | | | | cleaup & emergency config system reactivatedRainer Gerhards2011-07-091-257/+0
| * | | | | | milestone/[PARTWORK]: integrted script filter, but var access is missingRainer Gerhards2011-07-071-3/+7
| * | | | | | milestone:/[PARTWORK]: config is processed using new parser, except...Rainer Gerhards2011-07-061-16/+15
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-07-111-12/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * / / / / cosmetic: reformatted some codeRainer Gerhards2011-06-301-12/+5
| |/ / / /
* | | | | step: put plumbing in place for new input module config systemRainer Gerhards2011-05-031-16/+18
* | | | | step: config-specific module list used during config processingRainer Gerhards2011-04-271-4/+4
* | | | | step: added config-specific module listRainer Gerhards2011-04-271-1/+1
* | | | | step: $ModLoad handler no longe requries conf objRainer Gerhards2011-04-271-3/+2
* | | | | step: config handler setting from syslogd.c moved to rsconf.cRainer Gerhards2011-04-211-3/+3
* | | | | some more work was required on the ruleset modificationRainer Gerhards2011-04-191-1/+1
* | | | | milestone: ruleset now supports rsconf_tRainer Gerhards2011-04-191-8/+7
* | | | | milestone: conf obj interface now utilzes rsconf_tRainer Gerhards2011-04-191-22/+22
* | | | | milestone: templates are now in config objectRainer Gerhards2011-04-191-1/+1
* | | | | renaming conf.* wasn't a good idea -- undoingRainer Gerhards2011-04-191-0/+1453